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

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.72 by root, Fri Jun 10 12:45:20 2011 UTC vs.
Revision 1.123 by root, Tue Oct 9 04:53:53 2012 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 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 *
… …
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>
54#include <stdlib.h> 54#include <stdlib.h>
55#include <string.h> 55#include <string.h>
56#include <errno.h> 56#include <errno.h>
57#include <sys/types.h> 57#include <sys/types.h>
58#include <sys/stat.h> 58#include <sys/stat.h>
59#include <sys/statvfs.h>
60#include <limits.h> 59#include <limits.h>
61#include <fcntl.h> 60#include <fcntl.h>
62#include <assert.h> 61#include <assert.h>
63 62
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 form 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
69#ifndef ECANCELED
70# define ECANCELED EDOM
71#endif
72#ifndef ELOOP
73# define ELOOP EDOM
74#endif
75
76#if !defined(ENOTSOCK) && defined(WSAENOTSOCK)
77# define ENOTSOCK WSAENOTSOCK
78#endif
79
80static void eio_destroy (eio_req *req);
81
70#ifndef EIO_FINISH 82#ifndef EIO_FINISH
71# 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
72#endif 84#endif
73 85
74#ifndef EIO_DESTROY 86#ifndef EIO_DESTROY
… …
77 89
78#ifndef EIO_FEED 90#ifndef EIO_FEED
79# define EIO_FEED(req) do { if ((req)->feed ) (req)->feed (req); } while (0) 91# define EIO_FEED(req) do { if ((req)->feed ) (req)->feed (req); } while (0)
80#endif 92#endif
81 93
94#ifndef EIO_FD_TO_WIN32_HANDLE
95# define EIO_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
96#endif
97#ifndef EIO_WIN32_HANDLE_TO_FD
98# define EIO_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
99#endif
100
101#define EIO_ERRNO(errval,retval) ((errno = errval), retval)
102
103#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1)
104
82#ifdef _WIN32 105#ifdef _WIN32
83 106
84 /*doh*/ 107 #undef PAGESIZE
108 #define PAGESIZE 4096 /* GetSystemInfo? */
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 */
114 #define stat(path,buf) _stati64 (path,buf)
115 #define fstat(fd,buf) _fstati64 (fd,buf)
116 #endif
117 #define lstat(path,buf) stat (path,buf)
118 #define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))
119 #define mkdir(path,mode) _mkdir (path)
120 #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))
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 ()
127 #define chown(path,uid,gid) EIO_ENOSYS ()
128 #define fchown(fd,uid,gid) EIO_ENOSYS ()
129 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
130 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
131 #define mknod(path,mode,dev) 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 }
202
203 /* we could even stat and see if it exists */
204 static int
205 symlink (const char *old, const char *neu)
206 {
207 #if WINVER >= 0x0600
208 if (CreateSymbolicLink (neu, old, 1))
209 return 0;
210
211 if (CreateSymbolicLink (neu, old, 0))
212 return 0;
213 #endif
214
215 return EIO_ERRNO (ENOENT, -1);
216 }
217
218 /* POSIX API only */
219 #define CreateHardLink(neu,old,flags) 0
220 #define CreateSymbolicLink(neu,old,flags) 0
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
85#else 232#else
86 233
87# include <sys/time.h> 234 #include <sys/time.h>
88# include <sys/select.h> 235 #include <sys/select.h>
236 #include <sys/statvfs.h>
89# include <unistd.h> 237 #include <unistd.h>
238 #include <signal.h>
239 #include <dirent.h>
240
241 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
242 #include <sys/mman.h>
243 #endif
244
245 #define D_NAME(entp) entp->d_name
246
247 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
248 #if __FreeBSD__ || __NetBSD__ || __OpenBSD__
249 #define _DIRENT_HAVE_D_TYPE /* sigh */
250 #define D_INO(de) (de)->d_fileno
251 #define D_NAMLEN(de) (de)->d_namlen
252 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
253 #define D_INO(de) (de)->d_ino
254 #endif
255
256 #ifdef _D_EXACT_NAMLEN
257 #undef D_NAMLEN
258 #define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
259 #endif
260
261 #ifdef _DIRENT_HAVE_D_TYPE
262 #define D_TYPE(de) (de)->d_type
263 #endif
264
265 #ifndef EIO_STRUCT_DIRENT
266 #define EIO_STRUCT_DIRENT struct dirent
267 #endif
268
269#endif
270
271#if HAVE_UTIMES
90# include <utime.h> 272# include <utime.h>
91# include <signal.h>
92# include <dirent.h>
93
94#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
95# include <sys/mman.h>
96#endif
97
98/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
99# if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
100# define _DIRENT_HAVE_D_TYPE /* sigh */
101# define D_INO(de) (de)->d_fileno
102# define D_NAMLEN(de) (de)->d_namlen
103# elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
104# define D_INO(de) (de)->d_ino
105# endif 273#endif
106 274
107#ifdef _D_EXACT_NAMLEN 275#if HAVE_SYS_SYSCALL_H
108# undef D_NAMLEN 276# include <sys/syscall.h>
109# define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
110#endif
111
112# ifdef _DIRENT_HAVE_D_TYPE
113# define D_TYPE(de) (de)->d_type
114# endif 277#endif
115 278
116# ifndef EIO_STRUCT_DIRENT 279#if HAVE_SYS_PRCTL_H
117# define EIO_STRUCT_DIRENT struct dirent 280# include <sys/prctl.h>
118# endif
119
120#endif 281#endif
121 282
122#if HAVE_SENDFILE 283#if HAVE_SENDFILE
123# if __linux 284# if __linux
124# include <sys/sendfile.h> 285# include <sys/sendfile.h>
… …
139#endif 300#endif
140#ifndef D_INO 301#ifndef D_INO
141# define D_INO(de) 0 302# define D_INO(de) 0
142#endif 303#endif
143#ifndef D_NAMLEN 304#ifndef D_NAMLEN
144# define D_NAMLEN(de) strlen ((de)->d_name) 305# define D_NAMLEN(entp) strlen (D_NAME (entp))
145#endif 306#endif
146 307
147/* used for struct dirent, AIX doesn't provide it */ 308/* used for struct dirent, AIX doesn't provide it */
148#ifndef NAME_MAX 309#ifndef NAME_MAX
149# define NAME_MAX 4096 310# define NAME_MAX 4096
… …
156 317
157/* buffer size for various temporary buffers */ 318/* buffer size for various temporary buffers */
158#define EIO_BUFSIZE 65536 319#define EIO_BUFSIZE 65536
159 320
160#define dBUF \ 321#define dBUF \
161 char *eio_buf; \
162 ETP_WORKER_LOCK (self); \
163 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \ 322 char *eio_buf = malloc (EIO_BUFSIZE); \
164 ETP_WORKER_UNLOCK (self); \
165 errno = ENOMEM; \ 323 errno = ENOMEM; \
166 if (!eio_buf) \ 324 if (!eio_buf) \
167 return -1; 325 return -1
326
327#define FUBd \
328 free (eio_buf)
168 329
169#define EIO_TICKS ((1000000 + 1023) >> 10) 330#define EIO_TICKS ((1000000 + 1023) >> 10)
331
332/*****************************************************************************/
333
334struct tmpbuf
335{
336 void *ptr;
337 int len;
338};
339
340static void *
341tmpbuf_get (struct tmpbuf *buf, int len)
342{
343 if (buf->len < len)
344 {
345 free (buf->ptr);
346 buf->ptr = malloc (buf->len = len);
347 }
348
349 return buf->ptr;
350}
351
352struct 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 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/*****************************************************************************/
170 375
171#define ETP_PRI_MIN EIO_PRI_MIN 376#define ETP_PRI_MIN EIO_PRI_MIN
172#define ETP_PRI_MAX EIO_PRI_MAX 377#define ETP_PRI_MAX EIO_PRI_MAX
173 378
174struct etp_worker; 379struct etp_worker;
… …
178static int eio_finish (eio_req *req); 383static int eio_finish (eio_req *req);
179#define ETP_FINISH(req) eio_finish (req) 384#define ETP_FINISH(req) eio_finish (req)
180static void eio_execute (struct etp_worker *self, eio_req *req); 385static void eio_execute (struct etp_worker *self, eio_req *req);
181#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 386#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
182 387
183#define ETP_WORKER_CLEAR(req) \
184 if (wrk->dbuf) \
185 { \
186 free (wrk->dbuf); \
187 wrk->dbuf = 0; \
188 } \
189 \
190 if (wrk->dirp) \
191 { \
192 closedir (wrk->dirp); \
193 wrk->dirp = 0; \
194 }
195
196#define ETP_WORKER_COMMON \
197 void *dbuf; \
198 DIR *dirp;
199
200/*****************************************************************************/ 388/*****************************************************************************/
201 389
202#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 390#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
203 391
204/* calculate time difference in ~1/EIO_TICKS of a second */ 392/* calculate time difference in ~1/EIO_TICKS of a second */
205ECB_INLINE int 393ecb_inline int
206tvdiff (struct timeval *tv1, struct timeval *tv2) 394tvdiff (struct timeval *tv1, struct timeval *tv2)
207{ 395{
208 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS 396 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
209 + ((tv2->tv_usec - tv1->tv_usec) >> 10); 397 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
210} 398}
… …
215static void (*done_poll_cb) (void); 403static void (*done_poll_cb) (void);
216 404
217static unsigned int max_poll_time; /* reslock */ 405static unsigned int max_poll_time; /* reslock */
218static unsigned int max_poll_reqs; /* reslock */ 406static unsigned int max_poll_reqs; /* reslock */
219 407
220static volatile unsigned int nreqs; /* reqlock */ 408static unsigned int nreqs; /* reqlock */
221static volatile unsigned int nready; /* reqlock */ 409static unsigned int nready; /* reqlock */
222static volatile unsigned int npending; /* reqlock */ 410static unsigned int npending; /* reqlock */
223static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */ 411static unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
224static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */ 412static unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
225 413
226static xmutex_t wrklock; 414static xmutex_t wrklock;
227static xmutex_t reslock; 415static xmutex_t reslock;
228static xmutex_t reqlock; 416static xmutex_t reqlock;
229static xcond_t reqwait; 417static xcond_t reqwait;
230 418
231#if !HAVE_PREADWRITE
232/*
233 * make our pread/pwrite emulation safe against themselves, but not against
234 * normal read/write by using a mutex. slows down execution a lot,
235 * but that's your problem, not mine.
236 */
237static xmutex_t preadwritelock = X_MUTEX_INIT;
238#endif
239
240typedef struct etp_worker 419typedef struct etp_worker
241{ 420{
421 struct tmpbuf tmpbuf;
422
242 /* locked by wrklock */ 423 /* locked by wrklock */
243 struct etp_worker *prev, *next; 424 struct etp_worker *prev, *next;
244 425
245 xthread_t tid; 426 xthread_t tid;
246 427
247 /* locked by reslock, reqlock or wrklock */ 428#ifdef ETP_WORKER_COMMON
248 ETP_REQ *req; /* currently processed request */
249
250 ETP_WORKER_COMMON 429 ETP_WORKER_COMMON
430#endif
251} etp_worker; 431} etp_worker;
252 432
253static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */ 433static etp_worker wrk_first; /* NOT etp */
254 434
255#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 435#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
256#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) 436#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
257 437
258/* worker threads management */ 438/* worker threads management */
259 439
260static void ecb_cold 440static void
261etp_worker_clear (etp_worker *wrk) 441etp_worker_clear (etp_worker *wrk)
262{ 442{
263 ETP_WORKER_CLEAR (wrk);
264} 443}
265 444
266static void ecb_cold 445static void ecb_cold
267etp_worker_free (etp_worker *wrk) 446etp_worker_free (etp_worker *wrk)
268{ 447{
448 free (wrk->tmpbuf.ptr);
449
269 wrk->next->prev = wrk->prev; 450 wrk->next->prev = wrk->prev;
270 wrk->prev->next = wrk->next; 451 wrk->prev->next = wrk->next;
271 452
272 free (wrk); 453 free (wrk);
273} 454}
… …
329} etp_reqq; 510} etp_reqq;
330 511
331static etp_reqq req_queue; 512static etp_reqq req_queue;
332static etp_reqq res_queue; 513static etp_reqq res_queue;
333 514
515static void ecb_noinline ecb_cold
516reqq_init (etp_reqq *q)
517{
518 int pri;
519
520 for (pri = 0; pri < ETP_NUM_PRI; ++pri)
521 q->qs[pri] = q->qe[pri] = 0;
522
523 q->size = 0;
524}
525
334static int ecb_noinline 526static int ecb_noinline
335reqq_push (etp_reqq *q, ETP_REQ *req) 527reqq_push (etp_reqq *q, ETP_REQ *req)
336{ 528{
337 int pri = req->pri; 529 int pri = req->pri;
338 req->next = 0; 530 req->next = 0;
… …
372 } 564 }
373 565
374 abort (); 566 abort ();
375} 567}
376 568
377static void ecb_cold 569static int ecb_cold
378etp_thread_init (void) 570etp_init (void (*want_poll)(void), void (*done_poll)(void))
379{ 571{
380 X_MUTEX_CREATE (wrklock); 572 X_MUTEX_CREATE (wrklock);
381 X_MUTEX_CREATE (reslock); 573 X_MUTEX_CREATE (reslock);
382 X_MUTEX_CREATE (reqlock); 574 X_MUTEX_CREATE (reqlock);
383 X_COND_CREATE (reqwait); 575 X_COND_CREATE (reqwait);
384}
385 576
386static void ecb_cold 577 reqq_init (&req_queue);
387etp_atfork_prepare (void) 578 reqq_init (&res_queue);
388{
389 X_LOCK (wrklock);
390 X_LOCK (reqlock);
391 X_LOCK (reslock);
392#if !HAVE_PREADWRITE
393 X_LOCK (preadwritelock);
394#endif
395}
396 579
397static void ecb_cold 580 wrk_first.next =
398etp_atfork_parent (void) 581 wrk_first.prev = &wrk_first;
399{
400#if !HAVE_PREADWRITE
401 X_UNLOCK (preadwritelock);
402#endif
403 X_UNLOCK (reslock);
404 X_UNLOCK (reqlock);
405 X_UNLOCK (wrklock);
406}
407
408static void ecb_cold
409etp_atfork_child (void)
410{
411 ETP_REQ *prv;
412
413 while ((prv = reqq_shift (&req_queue)))
414 ETP_DESTROY (prv);
415
416 while ((prv = reqq_shift (&res_queue)))
417 ETP_DESTROY (prv);
418
419 while (wrk_first.next != &wrk_first)
420 {
421 etp_worker *wrk = wrk_first.next;
422
423 if (wrk->req)
424 ETP_DESTROY (wrk->req);
425
426 etp_worker_clear (wrk);
427 etp_worker_free (wrk);
428 }
429 582
430 started = 0; 583 started = 0;
431 idle = 0; 584 idle = 0;
432 nreqs = 0; 585 nreqs = 0;
433 nready = 0; 586 nready = 0;
434 npending = 0; 587 npending = 0;
435
436 etp_thread_init ();
437}
438
439static void ecb_cold
440etp_once_init (void)
441{
442 etp_thread_init ();
443 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
444}
445
446static int ecb_cold
447etp_init (void (*want_poll)(void), void (*done_poll)(void))
448{
449 static pthread_once_t doinit = PTHREAD_ONCE_INIT;
450
451 pthread_once (&doinit, etp_once_init);
452 588
453 want_poll_cb = want_poll; 589 want_poll_cb = want_poll;
454 done_poll_cb = done_poll; 590 done_poll_cb = done_poll;
455 591
456 return 0; 592 return 0;
… …
496} 632}
497 633
498static void ecb_cold 634static void ecb_cold
499etp_end_thread (void) 635etp_end_thread (void)
500{ 636{
501 eio_req *req = calloc (1, sizeof (eio_req)); 637 eio_req *req = calloc (1, sizeof (eio_req)); /* will be freed by worker */
502 638
503 req->type = -1; 639 req->type = -1;
504 req->pri = ETP_PRI_MAX - ETP_PRI_MIN; 640 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
505 641
506 X_LOCK (reqlock); 642 X_LOCK (reqlock);
… …
583} 719}
584 720
585static void 721static void
586etp_cancel (ETP_REQ *req) 722etp_cancel (ETP_REQ *req)
587{ 723{
588 X_LOCK (wrklock); 724 req->cancelled = 1;
589 req->flags |= EIO_FLAG_CANCELLED;
590 X_UNLOCK (wrklock);
591 725
592 eio_grp_cancel (req); 726 eio_grp_cancel (req);
593} 727}
594 728
595static void 729static void
… …
711 return eio_finish (grp); 845 return eio_finish (grp);
712 else 846 else
713 return 0; 847 return 0;
714} 848}
715 849
716void 850static void
717eio_destroy (eio_req *req) 851eio_destroy (eio_req *req)
718{ 852{
719 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1); 853 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1);
720 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2); 854 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2);
721 855
… …
739 if (grp->grp_first == req) 873 if (grp->grp_first == req)
740 grp->grp_first = req->grp_next; 874 grp->grp_first = req->grp_next;
741 875
742 res2 = grp_dec (grp); 876 res2 = grp_dec (grp);
743 877
744 if (!res && res2) 878 if (!res)
745 res = res2; 879 res = res2;
746 } 880 }
747 881
748 eio_destroy (req); 882 eio_destroy (req);
749 883
… …
834 return etp_poll (); 968 return etp_poll ();
835} 969}
836 970
837/*****************************************************************************/ 971/*****************************************************************************/
838/* work around various missing functions */ 972/* work around various missing functions */
839
840#if !HAVE_PREADWRITE
841# undef pread
842# undef pwrite
843# define pread eio__pread
844# define pwrite eio__pwrite
845
846static ssize_t
847eio__pread (int fd, void *buf, size_t count, off_t offset)
848{
849 ssize_t res;
850 off_t ooffset;
851
852 X_LOCK (preadwritelock);
853 ooffset = lseek (fd, 0, SEEK_CUR);
854 lseek (fd, offset, SEEK_SET);
855 res = read (fd, buf, count);
856 lseek (fd, ooffset, SEEK_SET);
857 X_UNLOCK (preadwritelock);
858
859 return res;
860}
861
862static ssize_t
863eio__pwrite (int fd, void *buf, size_t count, off_t offset)
864{
865 ssize_t res;
866 off_t ooffset;
867
868 X_LOCK (preadwritelock);
869 ooffset = lseek (fd, 0, SEEK_CUR);
870 lseek (fd, offset, SEEK_SET);
871 res = write (fd, buf, count);
872 lseek (fd, ooffset, SEEK_SET);
873 X_UNLOCK (preadwritelock);
874
875 return res;
876}
877#endif
878 973
879#ifndef HAVE_UTIMES 974#ifndef HAVE_UTIMES
880 975
881# undef utimes 976# undef utimes
882# define utimes(path,times) eio__utimes (path, times) 977# define utimes(path,times) eio__utimes (path, times)
… …
915 1010
916#if !HAVE_FDATASYNC 1011#if !HAVE_FDATASYNC
917# undef fdatasync 1012# undef fdatasync
918# define fdatasync(fd) fsync (fd) 1013# define fdatasync(fd) fsync (fd)
919#endif 1014#endif
1015
1016static int
1017eio__syncfs (int fd)
1018{
1019 int res;
1020
1021#if HAVE_SYS_SYNCFS
1022 res = (int)syscall (__NR_syncfs, (int)(fd));
1023#else
1024 res = EIO_ENOSYS ();
1025#endif
1026
1027 if (res < 0 && errno == ENOSYS && fd >= 0)
1028 sync ();
1029
1030 return res;
1031}
920 1032
921/* sync_file_range always needs emulation */ 1033/* sync_file_range always needs emulation */
922static int 1034static int
923eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags) 1035eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
924{ 1036{
… …
944 /* even though we could play tricks with the flags, it's better to always 1056 /* even though we could play tricks with the flags, it's better to always
945 * call fdatasync, as that matches the expectation of its users best */ 1057 * call fdatasync, as that matches the expectation of its users best */
946 return fdatasync (fd); 1058 return fdatasync (fd);
947} 1059}
948 1060
1061static int
1062eio__fallocate (int fd, int mode, off_t offset, size_t len)
1063{
1064#if HAVE_LINUX_FALLOCATE
1065 return fallocate (fd, mode, offset, len);
1066#else
1067 return EIO_ENOSYS ();
1068#endif
1069}
1070
949#if !HAVE_READAHEAD 1071#if !HAVE_READAHEAD
950# undef readahead 1072# undef readahead
951# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self) 1073# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
952 1074
953static ssize_t 1075static eio_ssize_t
954eio__readahead (int fd, off_t offset, size_t count, etp_worker *self) 1076eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
955{ 1077{
956 size_t todo = count; 1078 size_t todo = count;
957 dBUF; 1079 dBUF;
958 1080
… …
963 pread (fd, eio_buf, len, offset); 1085 pread (fd, eio_buf, len, offset);
964 offset += len; 1086 offset += len;
965 todo -= len; 1087 todo -= len;
966 } 1088 }
967 1089
968 errno = 0; 1090 FUBd;
1091
1092 /* linux's readahead basically only fails for EBADF or EINVAL (not mmappable) */
1093 /* but not for e.g. EIO or eof, so we also never fail */
969 return count; 1094 return 0;
970} 1095}
971 1096
972#endif 1097#endif
973 1098
974/* sendfile always needs emulation */ 1099/* sendfile always needs emulation */
975static ssize_t 1100static eio_ssize_t
976eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self) 1101eio__sendfile (int ofd, int ifd, off_t offset, size_t count)
977{ 1102{
978 ssize_t written = 0; 1103 eio_ssize_t written = 0;
979 ssize_t res; 1104 eio_ssize_t res;
980 1105
981 if (!count) 1106 if (!count)
982 return 0; 1107 return 0;
983 1108
984 for (;;) 1109 for (;;)
985 { 1110 {
1111#ifdef __APPLE__
1112# undef HAVE_SENDFILE /* broken, as everything on os x */
1113#endif
986#if HAVE_SENDFILE 1114#if HAVE_SENDFILE
987# if __linux 1115# if __linux
988 off_t soffset = offset; 1116 off_t soffset = offset;
989 res = sendfile (ofd, ifd, &soffset, count); 1117 res = sendfile (ofd, ifd, &soffset, count);
990 1118
… …
1006 1134
1007 /* according to source inspection, this is correct, and useful behaviour */ 1135 /* according to source inspection, this is correct, and useful behaviour */
1008 if (sbytes) 1136 if (sbytes)
1009 res = sbytes; 1137 res = sbytes;
1010 1138
1011# elif defined (__APPLE__) 1139# elif defined __APPLE__
1012 off_t sbytes = count; 1140 off_t sbytes = count;
1013 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 1141 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1014 1142
1015 /* according to the manpage, sbytes is always valid */ 1143 /* according to the manpage, sbytes is always valid */
1016 if (sbytes) 1144 if (sbytes)
… …
1033 if (res < 0 && sbytes) 1161 if (res < 0 && sbytes)
1034 res = sbytes; 1162 res = sbytes;
1035 1163
1036# endif 1164# endif
1037 1165
1038#elif defined (_WIN32) 1166#elif defined (_WIN32) && 0
1039 /* does not work, just for documentation of what would need to be done */ 1167 /* does not work, just for documentation of what would need to be done */
1040 /* actually, cannot be done like this, as TransmitFile changes the file offset, */ 1168 /* actually, cannot be done like this, as TransmitFile changes the file offset, */
1041 /* libeio guarantees that the file offset does not change, and windows */ 1169 /* libeio guarantees that the file offset does not change, and windows */
1042 /* has no way to get an independent handle to the same file description */ 1170 /* has no way to get an independent handle to the same file description */
1043 HANDLE h = TO_SOCKET (ifd); 1171 HANDLE h = TO_SOCKET (ifd);
1044 SetFilePointer (h, offset, 0, FILE_BEGIN); 1172 SetFilePointer (h, offset, 0, FILE_BEGIN);
1045 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0); 1173 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1046 1174
1047#else 1175#else
1048 res = -1; 1176 res = EIO_ENOSYS ();
1049 errno = ENOSYS;
1050#endif 1177#endif
1051 1178
1052 /* we assume sendfile can copy at least 128mb in one go */ 1179 /* we assume sendfile can copy at least 128mb in one go */
1053 if (res <= 128 * 1024 * 1024) 1180 if (res <= 128 * 1024 * 1024)
1054 { 1181 {
… …
1076 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 1203 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
1077 /* BSDs */ 1204 /* BSDs */
1078#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */ 1205#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
1079 || errno == ENOTSUP 1206 || errno == ENOTSUP
1080#endif 1207#endif
1208#ifdef EOPNOTSUPP /* windows */
1081 || errno == EOPNOTSUPP /* BSDs */ 1209 || errno == EOPNOTSUPP /* BSDs */
1210#endif
1082#if __solaris 1211#if __solaris
1083 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 1212 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
1084#endif 1213#endif
1085 ) 1214 )
1086 ) 1215 )
… …
1090 1219
1091 res = 0; 1220 res = 0;
1092 1221
1093 while (count) 1222 while (count)
1094 { 1223 {
1095 ssize_t cnt; 1224 eio_ssize_t cnt;
1096 1225
1097 cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset); 1226 cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset);
1098 1227
1099 if (cnt <= 0) 1228 if (cnt <= 0)
1100 { 1229 {
… …
1112 1241
1113 offset += cnt; 1242 offset += cnt;
1114 res += cnt; 1243 res += cnt;
1115 count -= cnt; 1244 count -= cnt;
1116 } 1245 }
1246
1247 FUBd;
1117 } 1248 }
1118 1249
1119 return res; 1250 return res;
1251}
1252
1253#ifdef PAGESIZE
1254# define eio_pagesize() PAGESIZE
1255#else
1256static intptr_t
1257eio_pagesize (void)
1258{
1259 static intptr_t page;
1260
1261 if (!page)
1262 page = sysconf (_SC_PAGESIZE);
1263
1264 return page;
1265}
1266#endif
1267
1268static void
1269eio_page_align (void **addr, size_t *length)
1270{
1271 intptr_t mask = eio_pagesize () - 1;
1272
1273 /* round down addr */
1274 intptr_t adj = mask & (intptr_t)*addr;
1275
1276 *addr = (void *)((intptr_t)*addr - adj);
1277 *length += adj;
1278
1279 /* round up length */
1280 *length = (*length + mask) & ~mask;
1281}
1282
1283#if !_POSIX_MEMLOCK
1284# define eio__mlockall(a) EIO_ENOSYS ()
1285#else
1286
1287static int
1288eio__mlockall (int flags)
1289{
1290 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1291 extern int mallopt (int, int);
1292 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1293 #endif
1294
1295 if (EIO_MCL_CURRENT != MCL_CURRENT
1296 || EIO_MCL_FUTURE != MCL_FUTURE)
1297 {
1298 flags = 0
1299 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
1300 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
1301 }
1302
1303 return mlockall (flags);
1304}
1305#endif
1306
1307#if !_POSIX_MEMLOCK_RANGE
1308# define eio__mlock(a,b) EIO_ENOSYS ()
1309#else
1310
1311static int
1312eio__mlock (void *addr, size_t length)
1313{
1314 eio_page_align (&addr, &length);
1315
1316 return mlock (addr, length);
1317}
1318
1319#endif
1320
1321#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1322# define eio__msync(a,b,c) EIO_ENOSYS ()
1323#else
1324
1325static int
1326eio__msync (void *mem, size_t len, int flags)
1327{
1328 eio_page_align (&mem, &len);
1329
1330 if (EIO_MS_ASYNC != MS_SYNC
1331 || EIO_MS_INVALIDATE != MS_INVALIDATE
1332 || EIO_MS_SYNC != MS_SYNC)
1333 {
1334 flags = 0
1335 | (flags & EIO_MS_ASYNC ? MS_ASYNC : 0)
1336 | (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
1337 | (flags & EIO_MS_SYNC ? MS_SYNC : 0);
1338 }
1339
1340 return msync (mem, len, flags);
1341}
1342
1343#endif
1344
1345static int
1346eio__mtouch (eio_req *req)
1347{
1348 void *mem = req->ptr2;
1349 size_t len = req->size;
1350 int flags = req->int1;
1351
1352 eio_page_align (&mem, &len);
1353
1354 {
1355 intptr_t addr = (intptr_t)mem;
1356 intptr_t end = addr + len;
1357 intptr_t page = eio_pagesize ();
1358
1359 if (addr < end)
1360 if (flags & EIO_MT_MODIFY) /* modify */
1361 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len && !EIO_CANCELLED (req));
1362 else
1363 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len && !EIO_CANCELLED (req));
1364 }
1365
1366 return 0;
1367}
1368
1369/*****************************************************************************/
1370/* requests implemented outside eio_execute, because they are so large */
1371
1372static void
1373eio__lseek (eio_req *req)
1374{
1375 /* this usually gets optimised away completely, or your compiler sucks, */
1376 /* or the whence constants really are not 0, 1, 2 */
1377 int whence = req->int2 == EIO_SEEK_SET ? SEEK_SET
1378 : req->int2 == EIO_SEEK_CUR ? SEEK_CUR
1379 : req->int2 == EIO_SEEK_END ? SEEK_END
1380 : req->int2;
1381
1382 req->offs = lseek (req->int1, req->offs, whence);
1383 req->result = req->offs == (off_t)-1 ? -1 : 0;
1384}
1385
1386/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
1387static int
1388eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
1389{
1390 const char *rel = path;
1391 char *res;
1392 char *tmp1, *tmp2;
1393#if SYMLOOP_MAX > 32
1394 int symlinks = SYMLOOP_MAX;
1395#else
1396 int symlinks = 32;
1397#endif
1398
1399 errno = EINVAL;
1400 if (!rel)
1401 return -1;
1402
1403 errno = ENOENT;
1404 if (!*rel)
1405 return -1;
1406
1407 res = tmpbuf_get (tmpbuf, PATH_MAX * 3);
1408 tmp1 = res + PATH_MAX;
1409 tmp2 = tmp1 + PATH_MAX;
1410
1411#if 0 /* disabled, the musl way to do things is just too racy */
1412#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1413 /* on linux we may be able to ask the kernel */
1414 {
1415 int fd = open (rel, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOATIME);
1416
1417 if (fd >= 0)
1418 {
1419 sprintf (tmp1, "/proc/self/fd/%d", fd);
1420 req->result = readlink (tmp1, res, PATH_MAX);
1421 close (fd);
1422
1423 /* here we should probably stat the open file and the disk file, to make sure they still match */
1424
1425 if (req->result > 0)
1426 goto done;
1427 }
1428 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO)
1429 return;
1430 }
1431#endif
1432#endif
1433
1434 if (*rel != '/')
1435 {
1436 int len;
1437
1438 errno = ENOENT;
1439 if (wd == EIO_INVALID_WD)
1440 return -1;
1441
1442 if (wd == EIO_CWD)
1443 {
1444 if (!getcwd (res, PATH_MAX))
1445 return -1;
1446
1447 len = strlen (res);
1448 }
1449 else
1450 memcpy (res, wd->str, len = wd->len);
1451
1452 if (res [1]) /* only use if not / */
1453 res += len;
1454 }
1455
1456 while (*rel)
1457 {
1458 eio_ssize_t len, linklen;
1459 const char *beg = rel;
1460
1461 while (*rel && *rel != '/')
1462 ++rel;
1463
1464 len = rel - beg;
1465
1466 if (!len) /* skip slashes */
1467 {
1468 ++rel;
1469 continue;
1470 }
1471
1472 if (beg [0] == '.')
1473 {
1474 if (len == 1)
1475 continue; /* . - nop */
1476
1477 if (beg [1] == '.' && len == 2)
1478 {
1479 /* .. - back up one component, if possible */
1480
1481 while (res != tmpbuf->ptr)
1482 if (*--res == '/')
1483 break;
1484
1485 continue;
1486 }
1487 }
1488
1489 errno = ENAMETOOLONG;
1490 if (res + 1 + len + 1 >= tmp1)
1491 return -1;
1492
1493 /* copy one component */
1494 *res = '/';
1495 memcpy (res + 1, beg, len);
1496
1497 /* zero-terminate, for readlink */
1498 res [len + 1] = 0;
1499
1500 /* now check if it's a symlink */
1501 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1502
1503 if (linklen < 0)
1504 {
1505 if (errno != EINVAL)
1506 return -1;
1507
1508 /* it's a normal directory. hopefully */
1509 res += len + 1;
1510 }
1511 else
1512 {
1513 /* yay, it was a symlink - build new path in tmp2 */
1514 int rellen = strlen (rel);
1515
1516 errno = ENAMETOOLONG;
1517 if (linklen + 1 + rellen >= PATH_MAX)
1518 return -1;
1519
1520 errno = ELOOP;
1521 if (!--symlinks)
1522 return -1;
1523
1524 if (*tmp1 == '/')
1525 res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1526
1527 /* we need to be careful, as rel might point into tmp2 already */
1528 memmove (tmp2 + linklen + 1, rel, rellen + 1);
1529 tmp2 [linklen] = '/';
1530 memcpy (tmp2, tmp1, linklen);
1531
1532 rel = tmp2;
1533 }
1534 }
1535
1536 /* special case for the lone root path */
1537 if (res == tmpbuf->ptr)
1538 *res++ = '/';
1539
1540 return res - (char *)tmpbuf->ptr;
1120} 1541}
1121 1542
1122static signed char 1543static signed char
1123eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1544eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1124{ 1545{
… …
1132 1553
1133#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */ 1554#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
1134#define EIO_SORT_FAST 60 /* when to only use insertion sort */ 1555#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1135 1556
1136static void 1557static void
1137eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1558eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1138{ 1559{
1139 unsigned char bits [9 + sizeof (ino_t) * 8]; 1560 unsigned char bits [9 + sizeof (eio_ino_t) * 8];
1140 unsigned char *bit = bits; 1561 unsigned char *bit = bits;
1141 1562
1142 assert (CHAR_BIT == 8); 1563 assert (CHAR_BIT == 8);
1143 assert (sizeof (eio_dirent) * 8 < 256); 1564 assert (sizeof (eio_dirent) * 8 < 256);
1144 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */ 1565 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
… …
1146 1567
1147 if (size <= EIO_SORT_FAST) 1568 if (size <= EIO_SORT_FAST)
1148 return; 1569 return;
1149 1570
1150 /* first prepare an array of bits to test in our radix sort */ 1571 /* first prepare an array of bits to test in our radix sort */
1151 /* try to take endianness into account, as well as differences in ino_t sizes */ 1572 /* try to take endianness into account, as well as differences in eio_ino_t sizes */
1152 /* inode_bits must contain all inodes ORed together */ 1573 /* inode_bits must contain all inodes ORed together */
1153 /* which is used to skip bits that are 0 everywhere, which is very common */ 1574 /* which is used to skip bits that are 0 everywhere, which is very common */
1154 { 1575 {
1155 ino_t endianness; 1576 eio_ino_t endianness;
1156 int i, j; 1577 int i, j;
1157 1578
1158 /* we store the byte offset of byte n into byte n of "endianness" */ 1579 /* we store the byte offset of byte n into byte n of "endianness" */
1159 for (i = 0; i < sizeof (ino_t); ++i) 1580 for (i = 0; i < sizeof (eio_ino_t); ++i)
1160 ((unsigned char *)&endianness)[i] = i; 1581 ((unsigned char *)&endianness)[i] = i;
1161 1582
1162 *bit++ = 0; 1583 *bit++ = 0;
1163 1584
1164 for (i = 0; i < sizeof (ino_t); ++i) 1585 for (i = 0; i < sizeof (eio_ino_t); ++i)
1165 { 1586 {
1166 /* shifting off the byte offsets out of "endianness" */ 1587 /* shifting off the byte offsets out of "endianness" */
1167 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8; 1588 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1168 endianness >>= 8; 1589 endianness >>= 8;
1169 1590
1170 for (j = 0; j < 8; ++j) 1591 for (j = 0; j < 8; ++j)
1171 if (inode_bits & (((ino_t)1) << (i * 8 + j))) 1592 if (inode_bits & (((eio_ino_t)1) << (i * 8 + j)))
1172 *bit++ = offs + j; 1593 *bit++ = offs + j;
1173 } 1594 }
1174 1595
1175 for (j = 0; j < 8; ++j) 1596 for (j = 0; j < 8; ++j)
1176 if (score_bits & (1 << j)) 1597 if (score_bits & (1 << j))
1177 *bit++ = offsetof (eio_dirent, score) * 8 + j; 1598 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1178 } 1599 }
1179 1600
1180 /* now actually do the sorting (a variant of MSD radix sort) */ 1601 /* now actually do the sorting (a variant of MSD radix sort) */
1181 { 1602 {
1182 eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base; 1603 eio_dirent *base_stk [9 + sizeof (eio_ino_t) * 8], *base;
1183 eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end; 1604 eio_dirent *end_stk [9 + sizeof (eio_ino_t) * 8], *end;
1184 unsigned char *bit_stk [9 + sizeof (ino_t) * 8]; 1605 unsigned char *bit_stk [9 + sizeof (eio_ino_t) * 8];
1185 int stk_idx = 0; 1606 int stk_idx = 0;
1186 1607
1187 base_stk [stk_idx] = dents; 1608 base_stk [stk_idx] = dents;
1188 end_stk [stk_idx] = dents + size; 1609 end_stk [stk_idx] = dents + size;
1189 bit_stk [stk_idx] = bit - 1; 1610 bit_stk [stk_idx] = bit - 1;
… …
1268 } 1689 }
1269 } 1690 }
1270} 1691}
1271 1692
1272static void 1693static void
1273eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1694eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1274{ 1695{
1275 if (size <= 1) 1696 if (size <= 1)
1276 return; /* our insertion sort relies on size > 0 */ 1697 return; /* our insertion sort relies on size > 0 */
1277 1698
1278 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */ 1699 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
… …
1286 1707
1287/* read a full directory */ 1708/* read a full directory */
1288static void 1709static void
1289eio__scandir (eio_req *req, etp_worker *self) 1710eio__scandir (eio_req *req, etp_worker *self)
1290{ 1711{
1291 DIR *dirp;
1292 EIO_STRUCT_DIRENT *entp;
1293 char *name, *names; 1712 char *name, *names;
1294 int namesalloc = 4096; 1713 int namesalloc = 4096 - sizeof (void *) * 4;
1295 int namesoffs = 0; 1714 int namesoffs = 0;
1296 int flags = req->int1; 1715 int flags = req->int1;
1297 eio_dirent *dents = 0; 1716 eio_dirent *dents = 0;
1298 int dentalloc = 128; 1717 int dentalloc = 128;
1299 int dentoffs = 0; 1718 int dentoffs = 0;
1300 ino_t inode_bits = 0; 1719 eio_ino_t inode_bits = 0;
1720#ifdef _WIN32
1721 HANDLE dirp;
1722 WIN32_FIND_DATA entp;
1723#else
1724 DIR *dirp;
1725 EIO_STRUCT_DIRENT *entp;
1726#endif
1301 1727
1302 req->result = -1; 1728 req->result = -1;
1303 1729
1304 if (!(flags & EIO_READDIR_DENTS)) 1730 if (!(flags & EIO_READDIR_DENTS))
1305 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1731 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1306 1732
1307 X_LOCK (wrklock); 1733#ifdef _WIN32
1308 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1734 {
1735 int len = strlen ((const char *)req->ptr1);
1736 char *path = malloc (MAX_PATH);
1737 const char *fmt;
1738 const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1739
1740 if (!len)
1741 fmt = "./*";
1742 else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1743 fmt = "%s*";
1744 else
1745 fmt = "%s/*";
1746
1747 _snprintf (path, MAX_PATH, fmt, reqpath);
1748 dirp = FindFirstFile (path, &entp);
1749 free (path);
1750
1751 if (dirp == INVALID_HANDLE_VALUE)
1752 {
1753 /* should steal _dosmaperr */
1754 switch (GetLastError ())
1755 {
1756 case ERROR_FILE_NOT_FOUND:
1757 req->result = 0;
1758 break;
1759
1760 case ERROR_INVALID_NAME:
1761 case ERROR_PATH_NOT_FOUND:
1762 case ERROR_NO_MORE_FILES:
1763 errno = ENOENT;
1764 break;
1765
1766 case ERROR_NOT_ENOUGH_MEMORY:
1767 errno = ENOMEM;
1768 break;
1769
1770 default:
1771 errno = EINVAL;
1772 break;
1773 }
1774
1775 return;
1776 }
1777 }
1778#else
1779 #if HAVE_AT
1780 if (req->wd)
1781 {
1782 int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1783
1784 if (fd < 0)
1785 return;
1786
1787 dirp = fdopendir (fd);
1788
1789 if (!dirp)
1790 close (fd);
1791 }
1792 else
1309 self->dirp = dirp = opendir (req->ptr1); 1793 dirp = opendir (req->ptr1);
1794 #else
1795 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
1796 #endif
1797
1798 if (!dirp)
1799 return;
1800#endif
1801
1802 if (req->flags & EIO_FLAG_PTR1_FREE)
1803 free (req->ptr1);
1310 1804
1311 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1805 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1312 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1806 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1313 req->ptr2 = names = malloc (namesalloc); 1807 req->ptr2 = names = malloc (namesalloc);
1314 X_UNLOCK (wrklock);
1315 1808
1316 if (dirp && names && (!flags || dents)) 1809 if (!names || (flags && !dents))
1810 return;
1811
1317 for (;;) 1812 for (;;)
1318 { 1813 {
1814 int done;
1815
1816#ifdef _WIN32
1817 done = !dirp;
1818#else
1319 errno = 0; 1819 errno = 0;
1320 entp = readdir (dirp); 1820 entp = readdir (dirp);
1821 done = !entp;
1822#endif
1321 1823
1322 if (!entp) 1824 if (done)
1323 { 1825 {
1826#ifndef _WIN32
1827 int old_errno = errno;
1828 closedir (dirp);
1829 errno = old_errno;
1830
1324 if (errno) 1831 if (errno)
1325 break; 1832 break;
1833#endif
1326 1834
1327 /* sort etc. */ 1835 /* sort etc. */
1328 req->int1 = flags; 1836 req->int1 = flags;
1329 req->result = dentoffs; 1837 req->result = dentoffs;
1330 1838
1331 if (flags & EIO_READDIR_STAT_ORDER) 1839 if (flags & EIO_READDIR_STAT_ORDER)
1332 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits); 1840 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1333 else if (flags & EIO_READDIR_DIRS_FIRST) 1841 else if (flags & EIO_READDIR_DIRS_FIRST)
1334 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1842 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1335 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */ 1843 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1336 else 1844 else
1845 {
1846 /* in this case, all is known, and we just put dirs first and sort them */
1847 eio_dirent *oth = dents + dentoffs;
1848 eio_dirent *dir = dents;
1849
1850 /* now partition dirs to the front, and non-dirs to the back */
1851 /* by walking from both sides and swapping if necessary */
1852 while (oth > dir)
1853 {
1854 if (dir->type == EIO_DT_DIR)
1855 ++dir;
1856 else if ((--oth)->type == EIO_DT_DIR)
1857 {
1858 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1859
1860 ++dir;
1861 }
1862 }
1863
1864 /* now sort the dirs only (dirs all have the same score) */
1865 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1866 }
1867
1868 break;
1869 }
1870
1871 /* now add the entry to our list(s) */
1872 name = D_NAME (entp);
1873
1874 /* skip . and .. entries */
1875 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1876 {
1877 int len = D_NAMLEN (entp) + 1;
1878
1879 while (ecb_expect_false (namesoffs + len > namesalloc))
1880 {
1881 namesalloc *= 2;
1882 req->ptr2 = names = realloc (names, namesalloc);
1883
1884 if (!names)
1885 break;
1886 }
1887
1888 memcpy (names + namesoffs, name, len);
1889
1890 if (dents)
1891 {
1892 struct eio_dirent *ent;
1893
1894 if (ecb_expect_false (dentoffs == dentalloc))
1337 { 1895 {
1338 /* in this case, all is known, and we just put dirs first and sort them */ 1896 dentalloc *= 2;
1897 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1898
1899 if (!dents)
1900 break;
1901 }
1902
1339 eio_dirent *oth = dents + dentoffs; 1903 ent = dents + dentoffs;
1340 eio_dirent *dir = dents;
1341 1904
1342 /* now partition dirs to the front, and non-dirs to the back */ 1905 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1343 /* by walking from both sides and swapping if necessary */ 1906 ent->namelen = len - 1;
1344 while (oth > dir) 1907 ent->inode = D_INO (entp);
1908
1909 inode_bits |= ent->inode;
1910
1911 switch (D_TYPE (entp))
1912 {
1913 default:
1914 ent->type = EIO_DT_UNKNOWN;
1915 flags |= EIO_READDIR_FOUND_UNKNOWN;
1916 break;
1917
1918 #ifdef DT_FIFO
1919 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1920 #endif
1921 #ifdef DT_CHR
1922 case DT_CHR: ent->type = EIO_DT_CHR; break;
1923 #endif
1924 #ifdef DT_MPC
1925 case DT_MPC: ent->type = EIO_DT_MPC; break;
1926 #endif
1927 #ifdef DT_DIR
1928 case DT_DIR: ent->type = EIO_DT_DIR; break;
1929 #endif
1930 #ifdef DT_NAM
1931 case DT_NAM: ent->type = EIO_DT_NAM; break;
1932 #endif
1933 #ifdef DT_BLK
1934 case DT_BLK: ent->type = EIO_DT_BLK; break;
1935 #endif
1936 #ifdef DT_MPB
1937 case DT_MPB: ent->type = EIO_DT_MPB; break;
1938 #endif
1939 #ifdef DT_REG
1940 case DT_REG: ent->type = EIO_DT_REG; break;
1941 #endif
1942 #ifdef DT_NWK
1943 case DT_NWK: ent->type = EIO_DT_NWK; break;
1944 #endif
1945 #ifdef DT_CMP
1946 case DT_CMP: ent->type = EIO_DT_CMP; break;
1947 #endif
1948 #ifdef DT_LNK
1949 case DT_LNK: ent->type = EIO_DT_LNK; break;
1950 #endif
1951 #ifdef DT_SOCK
1952 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1953 #endif
1954 #ifdef DT_DOOR
1955 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1956 #endif
1957 #ifdef DT_WHT
1958 case DT_WHT: ent->type = EIO_DT_WHT; break;
1959 #endif
1960 }
1961
1962 ent->score = 7;
1963
1964 if (flags & EIO_READDIR_DIRS_FIRST)
1965 {
1966 if (ent->type == EIO_DT_UNKNOWN)
1345 { 1967 {
1346 if (dir->type == EIO_DT_DIR) 1968 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1347 ++dir; 1969 ent->score = 1;
1348 else if ((--oth)->type == EIO_DT_DIR) 1970 else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1349 { 1971 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1350 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1351
1352 ++dir;
1353 }
1354 } 1972 }
1355 1973 else if (ent->type == EIO_DT_DIR)
1356 /* now sort the dirs only (dirs all have the same score) */ 1974 ent->score = 0;
1357 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1358 } 1975 }
1359
1360 break;
1361 }
1362
1363 /* now add the entry to our list(s) */
1364 name = entp->d_name;
1365
1366 /* skip . and .. entries */
1367 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1368 {
1369 int len = D_NAMLEN (entp) + 1;
1370
1371 while (ecb_expect_false (namesoffs + len > namesalloc))
1372 {
1373 namesalloc *= 2;
1374 X_LOCK (wrklock);
1375 req->ptr2 = names = realloc (names, namesalloc);
1376 X_UNLOCK (wrklock);
1377
1378 if (!names)
1379 break;
1380 } 1976 }
1381 1977
1382 memcpy (names + namesoffs, name, len);
1383
1384 if (dents)
1385 {
1386 struct eio_dirent *ent;
1387
1388 if (ecb_expect_false (dentoffs == dentalloc))
1389 {
1390 dentalloc *= 2;
1391 X_LOCK (wrklock);
1392 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1393 X_UNLOCK (wrklock);
1394
1395 if (!dents)
1396 break;
1397 }
1398
1399 ent = dents + dentoffs;
1400
1401 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1402 ent->namelen = len - 1;
1403 ent->inode = D_INO (entp);
1404
1405 inode_bits |= ent->inode;
1406
1407 switch (D_TYPE (entp))
1408 {
1409 default:
1410 ent->type = EIO_DT_UNKNOWN;
1411 flags |= EIO_READDIR_FOUND_UNKNOWN;
1412 break;
1413
1414 #ifdef DT_FIFO
1415 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1416 #endif
1417 #ifdef DT_CHR
1418 case DT_CHR: ent->type = EIO_DT_CHR; break;
1419 #endif
1420 #ifdef DT_MPC
1421 case DT_MPC: ent->type = EIO_DT_MPC; break;
1422 #endif
1423 #ifdef DT_DIR
1424 case DT_DIR: ent->type = EIO_DT_DIR; break;
1425 #endif
1426 #ifdef DT_NAM
1427 case DT_NAM: ent->type = EIO_DT_NAM; break;
1428 #endif
1429 #ifdef DT_BLK
1430 case DT_BLK: ent->type = EIO_DT_BLK; break;
1431 #endif
1432 #ifdef DT_MPB
1433 case DT_MPB: ent->type = EIO_DT_MPB; break;
1434 #endif
1435 #ifdef DT_REG
1436 case DT_REG: ent->type = EIO_DT_REG; break;
1437 #endif
1438 #ifdef DT_NWK
1439 case DT_NWK: ent->type = EIO_DT_NWK; break;
1440 #endif
1441 #ifdef DT_CMP
1442 case DT_CMP: ent->type = EIO_DT_CMP; break;
1443 #endif
1444 #ifdef DT_LNK
1445 case DT_LNK: ent->type = EIO_DT_LNK; break;
1446 #endif
1447 #ifdef DT_SOCK
1448 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1449 #endif
1450 #ifdef DT_DOOR
1451 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1452 #endif
1453 #ifdef DT_WHT
1454 case DT_WHT: ent->type = EIO_DT_WHT; break;
1455 #endif
1456 }
1457
1458 ent->score = 7;
1459
1460 if (flags & EIO_READDIR_DIRS_FIRST)
1461 {
1462 if (ent->type == EIO_DT_UNKNOWN)
1463 {
1464 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1465 ent->score = 1;
1466 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1467 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1468 }
1469 else if (ent->type == EIO_DT_DIR)
1470 ent->score = 0;
1471 }
1472 }
1473
1474 namesoffs += len; 1978 namesoffs += len;
1475 ++dentoffs; 1979 ++dentoffs;
1476 } 1980 }
1477 1981
1478 if (EIO_CANCELLED (req)) 1982 if (EIO_CANCELLED (req))
1479 { 1983 {
1480 errno = ECANCELED; 1984 errno = ECANCELED;
1481 break; 1985 break;
1482 } 1986 }
1987
1988#ifdef _WIN32
1989 if (!FindNextFile (dirp, &entp))
1990 {
1991 FindClose (dirp);
1992 dirp = 0;
1483 } 1993 }
1994#endif
1995 }
1484} 1996}
1485 1997
1486#ifdef PAGESIZE 1998/*****************************************************************************/
1487# define eio_pagesize() PAGESIZE 1999/* working directory stuff */
1488#else 2000/* various deficiencies in the posix 2008 api force us to */
1489static intptr_t 2001/* keep the absolute path in string form at all times */
1490eio_pagesize (void) 2002/* fuck yeah. */
1491{
1492 static intptr_t page;
1493 2003
1494 if (!page) 2004#if !HAVE_AT
1495 page = sysconf (_SC_PAGESIZE);
1496 2005
2006/* a bit like realpath, but usually faster because it doesn'T have to return */
2007/* an absolute or canonical path */
2008static const char *
2009wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2010{
2011 if (!wd || *path == '/')
2012 return path;
2013
2014 if (path [0] == '.' && !path [1])
2015 return wd->str;
2016
2017 {
2018 int l1 = wd->len;
2019 int l2 = strlen (path);
2020
2021 char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2);
2022
2023 memcpy (res, wd->str, l1);
2024 res [l1] = '/';
2025 memcpy (res + l1 + 1, path, l2 + 1);
2026
2027 return res;
2028 }
2029}
2030
2031#endif
2032
2033static eio_wd
2034eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2035{
2036 int fd;
2037 eio_wd res;
2038 int len = eio__realpath (tmpbuf, wd, path);
2039
2040 if (len < 0)
2041 return EIO_INVALID_WD;
2042
2043#if HAVE_AT
2044 fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
2045
2046 if (fd < 0)
2047 return EIO_INVALID_WD;
2048#endif
2049
2050 res = malloc (sizeof (*res) + len); /* one extra 0-byte */
2051
2052#if HAVE_AT
2053 res->fd = fd;
2054#endif
2055
2056 res->len = len;
2057 memcpy (res->str, tmpbuf->ptr, len);
2058 res->str [len] = 0;
2059
1497 return page; 2060 return res;
1498} 2061}
1499#endif
1500 2062
1501static void 2063eio_wd
1502eio_page_align (void **addr, size_t *length) 2064eio_wd_open_sync (eio_wd wd, const char *path)
1503{ 2065{
1504 intptr_t mask = eio_pagesize () - 1; 2066 struct tmpbuf tmpbuf = { 0 };
2067 wd = eio__wd_open_sync (&tmpbuf, wd, path);
2068 free (tmpbuf.ptr);
1505 2069
1506 /* round down addr */ 2070 return wd;
1507 intptr_t adj = mask & (intptr_t)*addr;
1508
1509 *addr = (void *)((intptr_t)*addr - adj);
1510 *length += adj;
1511
1512 /* round up length */
1513 *length = (*length + mask) & ~mask;
1514} 2071}
1515 2072
1516#if !_POSIX_MEMLOCK 2073void
1517# define eio__mlockall(a) ((errno = ENOSYS), -1) 2074eio_wd_close_sync (eio_wd wd)
1518#else 2075{
2076 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
2077 {
2078 #if HAVE_AT
2079 close (wd->fd);
2080 #endif
2081 free (wd);
2082 }
2083}
2084
2085#if HAVE_AT
2086
2087/* they forgot these */
1519 2088
1520static int 2089static int
1521eio__mlockall (int flags) 2090eio__truncateat (int dirfd, const char *path, off_t length)
1522{ 2091{
1523 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7 2092 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
1524 extern int mallopt (int, int); 2093 int res;
1525 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1526 #endif
1527 2094
1528 if (EIO_MCL_CURRENT != MCL_CURRENT 2095 if (fd < 0)
1529 || EIO_MCL_FUTURE != MCL_FUTURE) 2096 return fd;
1530 {
1531 flags = 0
1532 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
1533 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
1534 }
1535 2097
1536 return mlockall (flags); 2098 res = ftruncate (fd, length);
2099 close (fd);
2100 return res;
1537} 2101}
1538#endif
1539
1540#if !_POSIX_MEMLOCK_RANGE
1541# define eio__mlock(a,b) ((errno = ENOSYS), -1)
1542#else
1543 2102
1544static int 2103static int
1545eio__mlock (void *addr, size_t length) 2104eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
1546{ 2105{
1547 eio_page_align (&addr, &length); 2106 int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC);
2107 int res;
1548 2108
1549 return mlock (addr, length); 2109 if (fd < 0)
1550} 2110 return fd;
1551 2111
1552#endif 2112 res = fstatvfs (fd, buf);
1553 2113 close (fd);
1554#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1555# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
1556#else
1557
1558static int
1559eio__msync (void *mem, size_t len, int flags)
1560{
1561 eio_page_align (&mem, &len);
1562
1563 if (EIO_MS_ASYNC != MS_SYNC
1564 || EIO_MS_INVALIDATE != MS_INVALIDATE
1565 || EIO_MS_SYNC != MS_SYNC)
1566 {
1567 flags = 0
1568 | (flags & EIO_MS_ASYNC ? MS_ASYNC : 0)
1569 | (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
1570 | (flags & EIO_MS_SYNC ? MS_SYNC : 0);
1571 }
1572
1573 return msync (mem, len, flags);
1574}
1575
1576#endif
1577
1578static int
1579eio__mtouch (eio_req *req)
1580{
1581 void *mem = req->ptr2;
1582 size_t len = req->size;
1583 int flags = req->int1;
1584
1585 eio_page_align (&mem, &len);
1586
1587 {
1588 intptr_t addr = (intptr_t)mem;
1589 intptr_t end = addr + len;
1590 intptr_t page = eio_pagesize ();
1591
1592 if (addr < end)
1593 if (flags & EIO_MT_MODIFY) /* modify */
1594 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len && !EIO_CANCELLED (req));
1595 else
1596 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len && !EIO_CANCELLED (req));
1597 }
1598
1599 return 0; 2114 return res;
2115
1600} 2116}
2117
2118#endif
1601 2119
1602/*****************************************************************************/ 2120/*****************************************************************************/
1603 2121
1604#define ALLOC(len) \ 2122#define ALLOC(len) \
1605 if (!req->ptr2) \ 2123 if (!req->ptr2) \
… …
1614 req->result = -1; \ 2132 req->result = -1; \
1615 break; \ 2133 break; \
1616 } \ 2134 } \
1617 } 2135 }
1618 2136
2137static void ecb_noinline ecb_cold
2138etp_proc_init (void)
2139{
2140#if HAVE_PRCTL_SET_NAME
2141 /* provide a more sensible "thread name" */
2142 char name[16 + 1];
2143 const int namelen = sizeof (name) - 1;
2144 int len;
2145
2146 prctl (PR_GET_NAME, (unsigned long)name, 0, 0, 0);
2147 name [namelen] = 0;
2148 len = strlen (name);
2149 strcpy (name + (len <= namelen - 4 ? len : namelen - 4), "/eio");
2150 prctl (PR_SET_NAME, (unsigned long)name, 0, 0, 0);
2151#endif
2152}
2153
1619X_THREAD_PROC (etp_proc) 2154X_THREAD_PROC (etp_proc)
1620{ 2155{
1621 ETP_REQ *req; 2156 ETP_REQ *req;
1622 struct timespec ts; 2157 struct timespec ts;
1623 etp_worker *self = (etp_worker *)thr_arg; 2158 etp_worker *self = (etp_worker *)thr_arg;
1624 2159
2160 etp_proc_init ();
2161
1625 /* try to distribute timeouts somewhat randomly */ 2162 /* try to distribute timeouts somewhat evenly */
1626 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 2163 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1627 2164
1628 for (;;) 2165 for (;;)
1629 { 2166 {
2167 ts.tv_sec = 0;
2168
1630 X_LOCK (reqlock); 2169 X_LOCK (reqlock);
1631 2170
1632 for (;;) 2171 for (;;)
1633 { 2172 {
1634 self->req = req = reqq_shift (&req_queue); 2173 req = reqq_shift (&req_queue);
1635 2174
1636 if (req) 2175 if (req)
1637 break; 2176 break;
1638 2177
2178 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
2179 {
2180 X_UNLOCK (reqlock);
2181 X_LOCK (wrklock);
2182 --started;
2183 X_UNLOCK (wrklock);
2184 goto quit;
2185 }
2186
1639 ++idle; 2187 ++idle;
1640 2188
1641 ts.tv_sec = time (0) + idle_timeout; 2189 if (idle <= max_idle)
1642 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) 2190 /* we are allowed to idle, so do so without any timeout */
2191 X_COND_WAIT (reqwait, reqlock);
2192 else
1643 { 2193 {
1644 if (idle > max_idle) 2194 /* initialise timeout once */
1645 { 2195 if (!ts.tv_sec)
1646 --idle; 2196 ts.tv_sec = time (0) + idle_timeout;
1647 X_UNLOCK (reqlock);
1648 X_LOCK (wrklock);
1649 --started;
1650 X_UNLOCK (wrklock);
1651 goto quit;
1652 }
1653 2197
1654 /* we are allowed to idle, so do so without any timeout */
1655 X_COND_WAIT (reqwait, reqlock); 2198 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
2199 ts.tv_sec = 1; /* assuming this is not a value computed above.,.. */
1656 } 2200 }
1657 2201
1658 --idle; 2202 --idle;
1659 } 2203 }
1660 2204
… …
1663 X_UNLOCK (reqlock); 2207 X_UNLOCK (reqlock);
1664 2208
1665 if (req->type < 0) 2209 if (req->type < 0)
1666 goto quit; 2210 goto quit;
1667 2211
1668 if (!EIO_CANCELLED (req))
1669 ETP_EXECUTE (self, req); 2212 ETP_EXECUTE (self, req);
1670 2213
1671 X_LOCK (reslock); 2214 X_LOCK (reslock);
1672 2215
1673 ++npending; 2216 ++npending;
1674 2217
1675 if (!reqq_push (&res_queue, req) && want_poll_cb) 2218 if (!reqq_push (&res_queue, req) && want_poll_cb)
1676 want_poll_cb (); 2219 want_poll_cb ();
1677 2220
1678 self->req = 0;
1679 etp_worker_clear (self); 2221 etp_worker_clear (self);
1680 2222
1681 X_UNLOCK (reslock); 2223 X_UNLOCK (reslock);
1682 } 2224 }
1683 2225
1684quit: 2226quit:
2227 free (req);
2228
1685 X_LOCK (wrklock); 2229 X_LOCK (wrklock);
1686 etp_worker_free (self); 2230 etp_worker_free (self);
1687 X_UNLOCK (wrklock); 2231 X_UNLOCK (wrklock);
1688 2232
1689 return 0; 2233 return 0;
… …
1695eio_init (void (*want_poll)(void), void (*done_poll)(void)) 2239eio_init (void (*want_poll)(void), void (*done_poll)(void))
1696{ 2240{
1697 return etp_init (want_poll, done_poll); 2241 return etp_init (want_poll, done_poll);
1698} 2242}
1699 2243
1700ECB_INLINE void 2244ecb_inline void
1701eio_api_destroy (eio_req *req) 2245eio_api_destroy (eio_req *req)
1702{ 2246{
1703 free (req); 2247 free (req);
1704} 2248}
1705 2249
1706#define REQ(rtype) \ 2250#define REQ(rtype) \
1707 eio_req *req; \ 2251 eio_req *req; \
1708 \ 2252 \
1709 req = (eio_req *)calloc (1, sizeof *req); \ 2253 req = (eio_req *)calloc (1, sizeof *req); \
1710 if (!req) \ 2254 if (!req) \
1711 return 0; \ 2255 return 0; \
… …
1728 } 2272 }
1729 2273
1730static void 2274static void
1731eio_execute (etp_worker *self, eio_req *req) 2275eio_execute (etp_worker *self, eio_req *req)
1732{ 2276{
2277#if HAVE_AT
2278 int dirfd;
2279#else
2280 const char *path;
2281#endif
2282
2283 if (ecb_expect_false (EIO_CANCELLED (req)))
2284 {
2285 req->result = -1;
2286 req->errorno = ECANCELED;
2287 return;
2288 }
2289
2290 if (ecb_expect_false (req->wd == EIO_INVALID_WD))
2291 {
2292 req->result = -1;
2293 req->errorno = ENOENT;
2294 return;
2295 }
2296
2297 if (req->type >= EIO_OPEN)
2298 {
2299 #if HAVE_AT
2300 dirfd = WD2FD (req->wd);
2301 #else
2302 path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
2303 #endif
2304 }
2305
1733 switch (req->type) 2306 switch (req->type)
1734 { 2307 {
2308 case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
2309 req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
2310 break;
2311 case EIO_WD_CLOSE: req->result = 0;
2312 eio_wd_close_sync (req->wd); break;
2313
2314 case EIO_SEEK: eio__lseek (req); break;
1735 case EIO_READ: ALLOC (req->size); 2315 case EIO_READ: ALLOC (req->size);
1736 req->result = req->offs >= 0 2316 req->result = req->offs >= 0
1737 ? pread (req->int1, req->ptr2, req->size, req->offs) 2317 ? pread (req->int1, req->ptr2, req->size, req->offs)
1738 : read (req->int1, req->ptr2, req->size); break; 2318 : read (req->int1, req->ptr2, req->size); break;
1739 case EIO_WRITE: req->result = req->offs >= 0 2319 case EIO_WRITE: req->result = req->offs >= 0
1740 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 2320 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1741 : write (req->int1, req->ptr2, req->size); break; 2321 : write (req->int1, req->ptr2, req->size); break;
1742 2322
1743 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 2323 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1744 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break; 2324 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
2325
2326#if HAVE_AT
1745 2327
1746 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2328 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1747 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2329 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
1748 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2330 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2331 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
2332 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
2333 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
2334 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
2335 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
2336
2337 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
2338 case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
2339 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
2340 case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
2341 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
2342 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
2343 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2344 case EIO_READLINK: ALLOC (PATH_MAX);
2345 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
2346 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2347 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2348 case EIO_UTIME:
2349 case EIO_FUTIME:
2350 {
2351 struct timespec ts[2];
2352 struct timespec *times;
2353
2354 if (req->nv1 != -1. || req->nv2 != -1.)
2355 {
2356 ts[0].tv_sec = req->nv1;
2357 ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
2358 ts[1].tv_sec = req->nv2;
2359 ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
2360
2361 times = ts;
2362 }
2363 else
2364 times = 0;
2365
2366 req->result = req->type == EIO_FUTIME
2367 ? futimens (req->int1, times)
2368 : utimensat (dirfd, req->ptr1, times, 0);
2369 }
2370 break;
2371
2372#else
2373
2374 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2375 req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2376 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1749 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2377 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2378 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
2379 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
2380 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
2381 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
2382
2383 case EIO_UNLINK: req->result = unlink (path ); break;
2384 case EIO_RMDIR: req->result = rmdir (path ); break;
2385 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
2386 case EIO_RENAME: req->result = rename (path , req->ptr2); break;
2387 case EIO_LINK: req->result = link (path , req->ptr2); break;
2388 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
2389 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
2390 case EIO_READLINK: ALLOC (PATH_MAX);
2391 req->result = readlink (path, req->ptr2, PATH_MAX); break;
2392 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2393 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
2394
2395 case EIO_UTIME:
2396 case EIO_FUTIME:
2397 {
2398 struct timeval tv[2];
2399 struct timeval *times;
2400
2401 if (req->nv1 != -1. || req->nv2 != -1.)
2402 {
2403 tv[0].tv_sec = req->nv1;
2404 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
2405 tv[1].tv_sec = req->nv2;
2406 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
2407
2408 times = tv;
2409 }
2410 else
2411 times = 0;
2412
2413 req->result = req->type == EIO_FUTIME
2414 ? futimes (req->int1, times)
2415 : utimes (req->ptr1, times);
2416 }
2417 break;
2418
2419#endif
2420
2421 case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
2422 {
2423 ALLOC (req->result);
2424 memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
2425 }
2426 break;
2427
1750 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2428 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1751 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 2429 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1752 2430
1753 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1754 req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1755 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 2431 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1756 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 2432 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1757 2433
1758 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1759 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break; 2434 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1760 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
1761 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break; 2435 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
1762 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
1763 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break; 2436 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1764 2437
1765 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
1766 case EIO_CLOSE: req->result = close (req->int1); break; 2438 case EIO_CLOSE: req->result = close (req->int1); break;
1767 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 2439 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
1768 case EIO_UNLINK: req->result = unlink (req->ptr1); break;
1769 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1770 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
1771 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1772 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1773 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1774 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1775
1776 case EIO_READLINK: ALLOC (PATH_MAX);
1777 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1778
1779 case EIO_SYNC: req->result = 0; sync (); break; 2440 case EIO_SYNC: req->result = 0; sync (); break;
1780 case EIO_FSYNC: req->result = fsync (req->int1); break; 2441 case EIO_FSYNC: req->result = fsync (req->int1); break;
1781 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2442 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2443 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
2444 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1782 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break; 2445 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
1783 case EIO_MTOUCH: req->result = eio__mtouch (req); break; 2446 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
1784 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break; 2447 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
1785 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 2448 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
1786 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break; 2449 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
1787 2450
1788 case EIO_READDIR: eio__scandir (req, self); break; 2451 case EIO_READDIR: eio__scandir (req, self); break;
1789 2452
1790 case EIO_BUSY: 2453 case EIO_BUSY:
1791#ifdef _WIN32 2454#ifdef _WIN32
… …
1800 req->result = select (0, 0, 0, 0, &tv); 2463 req->result = select (0, 0, 0, 0, &tv);
1801 } 2464 }
1802#endif 2465#endif
1803 break; 2466 break;
1804 2467
1805 case EIO_UTIME:
1806 case EIO_FUTIME:
1807 {
1808 struct timeval tv[2];
1809 struct timeval *times;
1810
1811 if (req->nv1 != -1. || req->nv2 != -1.)
1812 {
1813 tv[0].tv_sec = req->nv1;
1814 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
1815 tv[1].tv_sec = req->nv2;
1816 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
1817
1818 times = tv;
1819 }
1820 else
1821 times = 0;
1822
1823 req->result = req->type == EIO_FUTIME
1824 ? futimes (req->int1, times)
1825 : utimes (req->ptr1, times);
1826 }
1827 break;
1828
1829 case EIO_GROUP: 2468 case EIO_GROUP:
1830 abort (); /* handled in eio_request */ 2469 abort (); /* handled in eio_request */
1831 2470
1832 case EIO_NOP: 2471 case EIO_NOP:
1833 req->result = 0; 2472 req->result = 0;
… …
1836 case EIO_CUSTOM: 2475 case EIO_CUSTOM:
1837 req->feed (req); 2476 req->feed (req);
1838 break; 2477 break;
1839 2478
1840 default: 2479 default:
1841 errno = ENOSYS;
1842 req->result = -1; 2480 req->result = EIO_ENOSYS ();
1843 break; 2481 break;
1844 } 2482 }
1845 2483
1846 req->errorno = errno; 2484 req->errorno = errno;
1847} 2485}
1848 2486
1849#ifndef EIO_NO_WRAPPERS 2487#ifndef EIO_NO_WRAPPERS
1850 2488
2489eio_req *eio_wd_open (const char *path, int pri, eio_cb cb, void *data)
2490{
2491 REQ (EIO_WD_OPEN); PATH; SEND;
2492}
2493
2494eio_req *eio_wd_close (eio_wd wd, int pri, eio_cb cb, void *data)
2495{
2496 REQ (EIO_WD_CLOSE); req->wd = wd; SEND;
2497}
2498
1851eio_req *eio_nop (int pri, eio_cb cb, void *data) 2499eio_req *eio_nop (int pri, eio_cb cb, void *data)
1852{ 2500{
1853 REQ (EIO_NOP); SEND; 2501 REQ (EIO_NOP); SEND;
1854} 2502}
1855 2503
… …
1871eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2519eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1872{ 2520{
1873 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2521 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1874} 2522}
1875 2523
2524eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2525{
2526 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2527}
2528
2529eio_req *eio_syncfs (int fd, int pri, eio_cb cb, void *data)
2530{
2531 REQ (EIO_SYNCFS); req->int1 = fd; SEND;
2532}
2533
2534eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2535{
2536 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2537}
2538
1876eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2539eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1877{ 2540{
1878 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2541 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1879} 2542}
1880 2543
… …
1886eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data) 2549eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
1887{ 2550{
1888 REQ (EIO_MLOCKALL); req->int1 = flags; SEND; 2551 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
1889} 2552}
1890 2553
1891eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data) 2554eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
1892{ 2555{
1893 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND; 2556 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
1894}
1895
1896eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
1897{
1898 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
1899} 2557}
1900 2558
1901eio_req *eio_close (int fd, int pri, eio_cb cb, void *data) 2559eio_req *eio_close (int fd, int pri, eio_cb cb, void *data)
1902{ 2560{
1903 REQ (EIO_CLOSE); req->int1 = fd; SEND; 2561 REQ (EIO_CLOSE); req->int1 = fd; SEND;
… …
1906eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data) 2564eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data)
1907{ 2565{
1908 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND; 2566 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND;
1909} 2567}
1910 2568
2569eio_req *eio_seek (int fd, off_t offset, int whence, int pri, eio_cb cb, void *data)
2570{
2571 REQ (EIO_SEEK); req->int1 = fd; req->offs = offset; req->int2 = whence; SEND;
2572}
2573
1911eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data) 2574eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
1912{ 2575{
1913 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND; 2576 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
1914} 2577}
1915 2578
… …
1941eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data) 2604eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data)
1942{ 2605{
1943 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND; 2606 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND;
1944} 2607}
1945 2608
1946eio_req *eio_fchown (int fd, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data) 2609eio_req *eio_fchown (int fd, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
1947{ 2610{
1948 REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND; 2611 REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
1949} 2612}
1950 2613
1951eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data) 2614eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data)
… …
1971eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data) 2634eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data)
1972{ 2635{
1973 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND; 2636 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND;
1974} 2637}
1975 2638
1976eio_req *eio_chown (const char *path, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data) 2639eio_req *eio_chown (const char *path, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
1977{ 2640{
1978 REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND; 2641 REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
1979} 2642}
1980 2643
1981eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data) 2644eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data)
… …
1995} 2658}
1996 2659
1997eio_req *eio_readlink (const char *path, int pri, eio_cb cb, void *data) 2660eio_req *eio_readlink (const char *path, int pri, eio_cb cb, void *data)
1998{ 2661{
1999 return eio__1path (EIO_READLINK, path, pri, cb, data); 2662 return eio__1path (EIO_READLINK, path, pri, cb, data);
2663}
2664
2665eio_req *eio_realpath (const char *path, int pri, eio_cb cb, void *data)
2666{
2667 return eio__1path (EIO_REALPATH, path, pri, cb, data);
2000} 2668}
2001 2669
2002eio_req *eio_stat (const char *path, int pri, eio_cb cb, void *data) 2670eio_req *eio_stat (const char *path, int pri, eio_cb cb, void *data)
2003{ 2671{
2004 return eio__1path (EIO_STAT, path, pri, cb, data); 2672 return eio__1path (EIO_STAT, path, pri, cb, data);
… …
2123} 2791}
2124 2792
2125/*****************************************************************************/ 2793/*****************************************************************************/
2126/* misc garbage */ 2794/* misc garbage */
2127 2795
2128ssize_t 2796eio_ssize_t
2129eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2797eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2130{ 2798{
2131 etp_worker wrk;
2132 ssize_t ret;
2133
2134 wrk.dbuf = 0;
2135
2136 ret = eio__sendfile (ofd, ifd, offset, count, &wrk); 2799 return eio__sendfile (ofd, ifd, offset, count);
2137
2138 if (wrk.dbuf)
2139 free (wrk.dbuf);
2140
2141 return ret;
2142} 2800}
2143 2801

Diff Legend

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