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

Comparing libeio/eio.c (file contents):
Revision 1.49 by root, Sat Jan 2 14:24:32 2010 UTC vs.
Revision 1.131 by root, Fri Aug 29 12:00:49 2014 UTC

1/* 1/*
2 * libeio implementation 2 * libeio implementation
3 * 3 *
4 * Copyright (c) 2007,2008,2009,2010 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,
… …
35 * and other provisions required by the GPL. If you do not delete the 35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under 36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL. 37 * either the BSD or the GPL.
38 */ 38 */
39 39
40#ifndef _WIN32
41# include "config.h"
42#endif
43
40#include "eio.h" 44#include "eio.h"
45#include "ecb.h"
41 46
42#ifdef EIO_STACKSIZE 47#ifdef EIO_STACKSIZE
43# define XTHREAD_STACKSIZE EIO_STACKSIZE 48# define X_STACKSIZE EIO_STACKSIZE
44#endif 49#endif
45#include "xthread.h" 50#include "xthread.h"
46 51
47#include <errno.h> 52#include <errno.h>
48#include <stddef.h> 53#include <stddef.h>
… …
53#include <sys/stat.h> 58#include <sys/stat.h>
54#include <limits.h> 59#include <limits.h>
55#include <fcntl.h> 60#include <fcntl.h>
56#include <assert.h> 61#include <assert.h>
57 62
63/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */
64/* intptr_t only comes from stdint.h, says idiot openbsd coder */
65#if HAVE_STDINT_H
66# include <stdint.h>
67#endif
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
58#ifndef EIO_FINISH 82#ifndef EIO_FINISH
59# 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
60#endif 84#endif
61 85
62#ifndef EIO_DESTROY 86#ifndef EIO_DESTROY
… …
65 89
66#ifndef EIO_FEED 90#ifndef EIO_FEED
67# 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)
68#endif 92#endif
69 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
70#ifdef _WIN32 105#ifdef _WIN32
71 106
72 /*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, 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
73#else 232#else
74 233
75# include "config.h"
76# include <sys/time.h> 234 #include <sys/time.h>
77# include <sys/select.h> 235 #include <sys/select.h>
78# include <sys/mman.h>
79# include <unistd.h> 236 #include <unistd.h>
237 #include <signal.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
248
249 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
250 #include <sys/mman.h>
251 #endif
252
253 #define D_NAME(entp) entp->d_name
254
255 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
256 #if __FreeBSD__ || __NetBSD__ || __OpenBSD__
257 #define _DIRENT_HAVE_D_TYPE /* sigh */
258 #define D_INO(de) (de)->d_fileno
259 #define D_NAMLEN(de) (de)->d_namlen
260 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
261 #define D_INO(de) (de)->d_ino
262 #endif
263
264 #ifdef _D_EXACT_NAMLEN
265 #undef D_NAMLEN
266 #define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
267 #endif
268
269 #ifdef _DIRENT_HAVE_D_TYPE
270 #define D_TYPE(de) (de)->d_type
271 #endif
272
273 #ifndef EIO_STRUCT_DIRENT
274 #define EIO_STRUCT_DIRENT struct dirent
275 #endif
276
277#endif
278
279#if HAVE_UTIMES
80# include <utime.h> 280# include <utime.h>
81# include <signal.h>
82# include <dirent.h>
83
84/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
85# if __freebsd || defined __NetBSD__ || defined __OpenBSD__
86# define _DIRENT_HAVE_D_TYPE /* sigh */
87# define D_INO(de) (de)->d_fileno
88# define D_NAMLEN(de) (de)->d_namlen
89# elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
90# define D_INO(de) (de)->d_ino
91# endif 281#endif
92 282
93#ifdef _D_EXACT_NAMLEN 283#if HAVE_SYS_SYSCALL_H
94# undef D_NAMLEN 284# include <sys/syscall.h>
95# define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
96#endif
97
98# ifdef _DIRENT_HAVE_D_TYPE
99# define D_TYPE(de) (de)->d_type
100# endif 285#endif
101 286
102# ifndef EIO_STRUCT_DIRENT 287#if HAVE_SYS_PRCTL_H
103# define EIO_STRUCT_DIRENT struct dirent 288# include <sys/prctl.h>
104# endif
105
106#endif 289#endif
107 290
108#if HAVE_SENDFILE 291#if HAVE_SENDFILE
109# if __linux 292# if __linux
110# include <sys/sendfile.h> 293# include <sys/sendfile.h>
111# elif __freebsd || defined __APPLE__ 294# elif __FreeBSD__ || defined __APPLE__
112# include <sys/socket.h> 295# include <sys/socket.h>
113# include <sys/uio.h> 296# include <sys/uio.h>
114# elif __hpux 297# elif __hpux
115# include <sys/socket.h> 298# include <sys/socket.h>
116# elif __solaris 299# elif __solaris
… …
125#endif 308#endif
126#ifndef D_INO 309#ifndef D_INO
127# define D_INO(de) 0 310# define D_INO(de) 0
128#endif 311#endif
129#ifndef D_NAMLEN 312#ifndef D_NAMLEN
130# define D_NAMLEN(de) strlen ((de)->d_name) 313# define D_NAMLEN(entp) strlen (D_NAME (entp))
131#endif 314#endif
132
133/* number of seconds after which an idle threads exit */
134#define IDLE_TIMEOUT 10
135 315
136/* used for struct dirent, AIX doesn't provide it */ 316/* used for struct dirent, AIX doesn't provide it */
137#ifndef NAME_MAX 317#ifndef NAME_MAX
138# define NAME_MAX 4096 318# define NAME_MAX 4096
139#endif 319#endif
140 320
321/* used for readlink etc. */
322#ifndef PATH_MAX
323# define PATH_MAX 4096
324#endif
325
141/* buffer size for various temporary buffers */ 326/* buffer size for various temporary buffers */
142#define EIO_BUFSIZE 65536 327#define EIO_BUFSIZE 65536
143 328
144#define dBUF \ 329#define dBUF \
145 char *eio_buf; \
146 ETP_WORKER_LOCK (self); \
147 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \ 330 char *eio_buf = malloc (EIO_BUFSIZE); \
148 ETP_WORKER_UNLOCK (self); \
149 errno = ENOMEM; \ 331 errno = ENOMEM; \
150 if (!eio_buf) \ 332 if (!eio_buf) \
151 return -1; 333 return -1
152 334
153#define EIO_TICKS ((1000000 + 1023) >> 10) 335#define FUBd \
336 free (eio_buf)
154 337
155/*****************************************************************************/ 338/*****************************************************************************/
156 339
157#if __GNUC__ >= 3 340struct tmpbuf
158# define expect(expr,value) __builtin_expect ((expr),(value)) 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
159#else 366#else
160# define expect(expr,value) (expr) 367 #define HAVE_AT 0
368 static const char *wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path);
161#endif 369#endif
162 370
163#define expect_false(expr) expect ((expr) != 0, 0) 371struct eio_pwd
164#define expect_true(expr) expect ((expr) != 0, 1) 372{
373#if HAVE_AT
374 int fd;
375#endif
376 int len;
377 char str[1]; /* actually, a 0-terminated canonical path */
378};
165 379
166/*****************************************************************************/ 380/*****************************************************************************/
167 381
168#define ETP_PRI_MIN EIO_PRI_MIN 382#define ETP_PRI_MIN EIO_PRI_MIN
169#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
170 387
171struct etp_worker; 388struct etp_worker;
172 389
173#define ETP_REQ eio_req 390#define ETP_REQ eio_req
174#define ETP_DESTROY(req) eio_destroy (req) 391#define ETP_DESTROY(req) eio_destroy (req)
175static int eio_finish (eio_req *req); 392static int eio_finish (eio_req *req);
176#define ETP_FINISH(req) eio_finish (req) 393#define ETP_FINISH(req) eio_finish (req)
177static void eio_execute (struct etp_worker *self, eio_req *req); 394static void eio_execute (struct etp_worker *self, eio_req *req);
178#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 395#define ETP_EXECUTE(wrk,req) eio_execute (wrk, req)
179 396
180#define ETP_WORKER_CLEAR(req) \ 397#include "etp.c"
181 if (wrk->dbuf) \
182 { \
183 free (wrk->dbuf); \
184 wrk->dbuf = 0; \
185 } \
186 \
187 if (wrk->dirp) \
188 { \
189 closedir (wrk->dirp); \
190 wrk->dirp = 0; \
191 }
192
193#define ETP_WORKER_COMMON \
194 void *dbuf; \
195 DIR *dirp;
196 398
197/*****************************************************************************/ 399/*****************************************************************************/
198 400
199#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
200
201/* calculate time difference in ~1/EIO_TICKS of a second */
202static int tvdiff (struct timeval *tv1, struct timeval *tv2)
203{
204 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
205 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
206}
207
208static unsigned int started, idle, wanted = 4;
209
210static void (*want_poll_cb) (void);
211static void (*done_poll_cb) (void);
212
213static unsigned int max_poll_time; /* reslock */
214static unsigned int max_poll_reqs; /* reslock */
215
216static volatile unsigned int nreqs; /* reqlock */
217static volatile unsigned int nready; /* reqlock */
218static volatile unsigned int npending; /* reqlock */
219static volatile unsigned int max_idle = 4;
220
221static mutex_t wrklock = X_MUTEX_INIT;
222static mutex_t reslock = X_MUTEX_INIT;
223static mutex_t reqlock = X_MUTEX_INIT;
224static cond_t reqwait = X_COND_INIT;
225
226#if !HAVE_PREADWRITE
227/*
228 * make our pread/pwrite emulation safe against themselves, but not against
229 * normal read/write by using a mutex. slows down execution a lot,
230 * but that's your problem, not mine.
231 */
232static mutex_t preadwritelock = X_MUTEX_INIT;
233#endif
234
235typedef struct etp_worker
236{
237 /* locked by wrklock */
238 struct etp_worker *prev, *next;
239
240 thread_t tid;
241
242 /* locked by reslock, reqlock or wrklock */
243 ETP_REQ *req; /* currently processed request */
244
245 ETP_WORKER_COMMON
246} etp_worker;
247
248static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */
249
250#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
251#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
252
253/* worker threads management */
254
255static void etp_worker_clear (etp_worker *wrk)
256{
257 ETP_WORKER_CLEAR (wrk);
258}
259
260static void etp_worker_free (etp_worker *wrk)
261{
262 wrk->next->prev = wrk->prev;
263 wrk->prev->next = wrk->next;
264
265 free (wrk);
266}
267
268static unsigned int etp_nreqs (void)
269{
270 int retval;
271 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
272 retval = nreqs;
273 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
274 return retval;
275}
276
277static unsigned int etp_nready (void)
278{
279 unsigned int retval;
280
281 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
282 retval = nready;
283 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
284
285 return retval;
286}
287
288static unsigned int etp_npending (void)
289{
290 unsigned int retval;
291
292 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
293 retval = npending;
294 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
295
296 return retval;
297}
298
299static unsigned int etp_nthreads (void)
300{
301 unsigned int retval;
302
303 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
304 retval = started;
305 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
306
307 return retval;
308}
309
310/*
311 * a somewhat faster data structure might be nice, but
312 * with 8 priorities this actually needs <20 insns
313 * per shift, the most expensive operation.
314 */
315typedef struct {
316 ETP_REQ *qs[ETP_NUM_PRI], *qe[ETP_NUM_PRI]; /* qstart, qend */
317 int size;
318} etp_reqq;
319
320static etp_reqq req_queue;
321static etp_reqq res_queue;
322
323static int reqq_push (etp_reqq *q, ETP_REQ *req)
324{
325 int pri = req->pri;
326 req->next = 0;
327
328 if (q->qe[pri])
329 {
330 q->qe[pri]->next = req;
331 q->qe[pri] = req;
332 }
333 else
334 q->qe[pri] = q->qs[pri] = req;
335
336 return q->size++;
337}
338
339static ETP_REQ *reqq_shift (etp_reqq *q)
340{
341 int pri;
342
343 if (!q->size)
344 return 0;
345
346 --q->size;
347
348 for (pri = ETP_NUM_PRI; pri--; )
349 {
350 eio_req *req = q->qs[pri];
351
352 if (req)
353 {
354 if (!(q->qs[pri] = (eio_req *)req->next))
355 q->qe[pri] = 0;
356
357 return req;
358 }
359 }
360
361 abort ();
362}
363
364static void etp_atfork_prepare (void)
365{
366 X_LOCK (wrklock);
367 X_LOCK (reqlock);
368 X_LOCK (reslock);
369#if !HAVE_PREADWRITE
370 X_LOCK (preadwritelock);
371#endif
372}
373
374static void etp_atfork_parent (void)
375{
376#if !HAVE_PREADWRITE
377 X_UNLOCK (preadwritelock);
378#endif
379 X_UNLOCK (reslock);
380 X_UNLOCK (reqlock);
381 X_UNLOCK (wrklock);
382}
383
384static void etp_atfork_child (void)
385{
386 ETP_REQ *prv;
387
388 while ((prv = reqq_shift (&req_queue)))
389 ETP_DESTROY (prv);
390
391 while ((prv = reqq_shift (&res_queue)))
392 ETP_DESTROY (prv);
393
394 while (wrk_first.next != &wrk_first)
395 {
396 etp_worker *wrk = wrk_first.next;
397
398 if (wrk->req)
399 ETP_DESTROY (wrk->req);
400
401 etp_worker_clear (wrk);
402 etp_worker_free (wrk);
403 }
404
405 started = 0;
406 idle = 0;
407 nreqs = 0;
408 nready = 0;
409 npending = 0;
410
411 etp_atfork_parent ();
412}
413
414static void 401static void
415etp_once_init (void)
416{
417 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
418}
419
420static int
421etp_init (void (*want_poll)(void), void (*done_poll)(void))
422{
423 static pthread_once_t doinit = PTHREAD_ONCE_INIT;
424
425 pthread_once (&doinit, etp_once_init);
426
427 want_poll_cb = want_poll;
428 done_poll_cb = done_poll;
429
430 return 0;
431}
432
433X_THREAD_PROC (etp_proc);
434
435static void etp_start_thread (void)
436{
437 etp_worker *wrk = calloc (1, sizeof (etp_worker));
438
439 /*TODO*/
440 assert (("unable to allocate worker thread data", wrk));
441
442 X_LOCK (wrklock);
443
444 if (thread_create (&wrk->tid, etp_proc, (void *)wrk))
445 {
446 wrk->prev = &wrk_first;
447 wrk->next = wrk_first.next;
448 wrk_first.next->prev = wrk;
449 wrk_first.next = wrk;
450 ++started;
451 }
452 else
453 free (wrk);
454
455 X_UNLOCK (wrklock);
456}
457
458static void etp_maybe_start_thread (void)
459{
460 if (expect_true (etp_nthreads () >= wanted))
461 return;
462
463 /* todo: maybe use idle here, but might be less exact */
464 if (expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
465 return;
466
467 etp_start_thread ();
468}
469
470static void etp_end_thread (void)
471{
472 eio_req *req = calloc (1, sizeof (eio_req));
473
474 req->type = -1;
475 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
476
477 X_LOCK (reqlock);
478 reqq_push (&req_queue, req);
479 X_COND_SIGNAL (reqwait);
480 X_UNLOCK (reqlock);
481
482 X_LOCK (wrklock);
483 --started;
484 X_UNLOCK (wrklock);
485}
486
487static int etp_poll (void)
488{
489 unsigned int maxreqs;
490 unsigned int maxtime;
491 struct timeval tv_start, tv_now;
492
493 X_LOCK (reslock);
494 maxreqs = max_poll_reqs;
495 maxtime = max_poll_time;
496 X_UNLOCK (reslock);
497
498 if (maxtime)
499 gettimeofday (&tv_start, 0);
500
501 for (;;)
502 {
503 ETP_REQ *req;
504
505 etp_maybe_start_thread ();
506
507 X_LOCK (reslock);
508 req = reqq_shift (&res_queue);
509
510 if (req)
511 {
512 --npending;
513
514 if (!res_queue.size && done_poll_cb)
515 done_poll_cb ();
516 }
517
518 X_UNLOCK (reslock);
519
520 if (!req)
521 return 0;
522
523 X_LOCK (reqlock);
524 --nreqs;
525 X_UNLOCK (reqlock);
526
527 if (expect_false (req->type == EIO_GROUP && req->size))
528 {
529 req->int1 = 1; /* mark request as delayed */
530 continue;
531 }
532 else
533 {
534 int res = ETP_FINISH (req);
535 if (expect_false (res))
536 return res;
537 }
538
539 if (expect_false (maxreqs && !--maxreqs))
540 break;
541
542 if (maxtime)
543 {
544 gettimeofday (&tv_now, 0);
545
546 if (tvdiff (&tv_start, &tv_now) >= maxtime)
547 break;
548 }
549 }
550
551 errno = EAGAIN;
552 return -1;
553}
554
555static void etp_cancel (ETP_REQ *req)
556{
557 X_LOCK (wrklock);
558 req->flags |= EIO_FLAG_CANCELLED;
559 X_UNLOCK (wrklock);
560
561 eio_grp_cancel (req);
562}
563
564static void etp_submit (ETP_REQ *req)
565{
566 req->pri -= ETP_PRI_MIN;
567
568 if (expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
569 if (expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
570
571 if (expect_false (req->type == EIO_GROUP))
572 {
573 /* I hope this is worth it :/ */
574 X_LOCK (reqlock);
575 ++nreqs;
576 X_UNLOCK (reqlock);
577
578 X_LOCK (reslock);
579
580 ++npending;
581
582 if (!reqq_push (&res_queue, req) && want_poll_cb)
583 want_poll_cb ();
584
585 X_UNLOCK (reslock);
586 }
587 else
588 {
589 X_LOCK (reqlock);
590 ++nreqs;
591 ++nready;
592 reqq_push (&req_queue, req);
593 X_COND_SIGNAL (reqwait);
594 X_UNLOCK (reqlock);
595
596 etp_maybe_start_thread ();
597 }
598}
599
600static void etp_set_max_poll_time (double nseconds)
601{
602 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
603 max_poll_time = nseconds * EIO_TICKS;
604 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
605}
606
607static void etp_set_max_poll_reqs (unsigned int maxreqs)
608{
609 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
610 max_poll_reqs = maxreqs;
611 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
612}
613
614static void etp_set_max_idle (unsigned int nthreads)
615{
616 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
617 max_idle = nthreads <= 0 ? 1 : nthreads;
618 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
619}
620
621static void etp_set_min_parallel (unsigned int nthreads)
622{
623 if (wanted < nthreads)
624 wanted = nthreads;
625}
626
627static void etp_set_max_parallel (unsigned int nthreads)
628{
629 if (wanted > nthreads)
630 wanted = nthreads;
631
632 while (started > wanted)
633 etp_end_thread ();
634}
635
636/*****************************************************************************/
637
638static void grp_try_feed (eio_req *grp) 402grp_try_feed (eio_req *grp)
639{ 403{
640 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 404 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
641 { 405 {
642 grp->flags &= ~EIO_FLAG_GROUPADD; 406 grp->flags &= ~EIO_FLAG_GROUPADD;
643 407
… …
650 break; 414 break;
651 } 415 }
652 } 416 }
653} 417}
654 418
419static int
655static int grp_dec (eio_req *grp) 420grp_dec (eio_req *grp)
656{ 421{
657 --grp->size; 422 --grp->size;
658 423
659 /* call feeder, if applicable */ 424 /* call feeder, if applicable */
660 grp_try_feed (grp); 425 grp_try_feed (grp);
… …
664 return eio_finish (grp); 429 return eio_finish (grp);
665 else 430 else
666 return 0; 431 return 0;
667} 432}
668 433
434static void
669void eio_destroy (eio_req *req) 435eio_destroy (eio_req *req)
670{ 436{
671 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1); 437 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1);
672 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2); 438 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2);
673 439
674 EIO_DESTROY (req); 440 EIO_DESTROY (req);
675} 441}
676 442
443static int
677static int eio_finish (eio_req *req) 444eio_finish (eio_req *req)
678{ 445{
679 int res = EIO_FINISH (req); 446 int res = EIO_FINISH (req);
680 447
681 if (req->grp) 448 if (req->grp)
682 { 449 {
… …
690 if (grp->grp_first == req) 457 if (grp->grp_first == req)
691 grp->grp_first = req->grp_next; 458 grp->grp_first = req->grp_next;
692 459
693 res2 = grp_dec (grp); 460 res2 = grp_dec (grp);
694 461
695 if (!res && res2) 462 if (!res)
696 res = res2; 463 res = res2;
697 } 464 }
698 465
699 eio_destroy (req); 466 eio_destroy (req);
700 467
701 return res; 468 return res;
702} 469}
703 470
471void
704void eio_grp_cancel (eio_req *grp) 472eio_grp_cancel (eio_req *grp)
705{ 473{
706 for (grp = grp->grp_first; grp; grp = grp->grp_next)
707 eio_cancel (grp); 474 etp_grp_cancel (grp);
708} 475}
709 476
477void
710void eio_cancel (eio_req *req) 478eio_cancel (eio_req *req)
711{ 479{
712 etp_cancel (req); 480 etp_cancel (req);
713} 481}
714 482
483void
715void eio_submit (eio_req *req) 484eio_submit (eio_req *req)
716{ 485{
717 etp_submit (req); 486 etp_submit (req);
718} 487}
719 488
720unsigned int eio_nreqs (void) 489unsigned int
490eio_nreqs (void)
721{ 491{
722 return etp_nreqs (); 492 return etp_nreqs ();
723} 493}
724 494
725unsigned int eio_nready (void) 495unsigned int
496eio_nready (void)
726{ 497{
727 return etp_nready (); 498 return etp_nready ();
728} 499}
729 500
730unsigned int eio_npending (void) 501unsigned int
502eio_npending (void)
731{ 503{
732 return etp_npending (); 504 return etp_npending ();
733} 505}
734 506
735unsigned int eio_nthreads (void) 507unsigned int ecb_cold
508eio_nthreads (void)
736{ 509{
737 return etp_nthreads (); 510 return etp_nthreads ();
738} 511}
739 512
513void ecb_cold
740void eio_set_max_poll_time (double nseconds) 514eio_set_max_poll_time (double nseconds)
741{ 515{
742 etp_set_max_poll_time (nseconds); 516 etp_set_max_poll_time (nseconds);
743} 517}
744 518
519void ecb_cold
745void eio_set_max_poll_reqs (unsigned int maxreqs) 520eio_set_max_poll_reqs (unsigned int maxreqs)
746{ 521{
747 etp_set_max_poll_reqs (maxreqs); 522 etp_set_max_poll_reqs (maxreqs);
748} 523}
749 524
525void ecb_cold
750void eio_set_max_idle (unsigned int nthreads) 526eio_set_max_idle (unsigned int nthreads)
751{ 527{
752 etp_set_max_idle (nthreads); 528 etp_set_max_idle (nthreads);
753} 529}
754 530
531void ecb_cold
532eio_set_idle_timeout (unsigned int seconds)
533{
534 etp_set_idle_timeout (seconds);
535}
536
537void ecb_cold
755void eio_set_min_parallel (unsigned int nthreads) 538eio_set_min_parallel (unsigned int nthreads)
756{ 539{
757 etp_set_min_parallel (nthreads); 540 etp_set_min_parallel (nthreads);
758} 541}
759 542
543void ecb_cold
760void eio_set_max_parallel (unsigned int nthreads) 544eio_set_max_parallel (unsigned int nthreads)
761{ 545{
762 etp_set_max_parallel (nthreads); 546 etp_set_max_parallel (nthreads);
763} 547}
764 548
765int eio_poll (void) 549int eio_poll (void)
… …
768} 552}
769 553
770/*****************************************************************************/ 554/*****************************************************************************/
771/* work around various missing functions */ 555/* work around various missing functions */
772 556
773#if !HAVE_PREADWRITE
774# undef pread
775# undef pwrite
776# define pread eio__pread
777# define pwrite eio__pwrite
778
779static ssize_t
780eio__pread (int fd, void *buf, size_t count, off_t offset)
781{
782 ssize_t res;
783 off_t ooffset;
784
785 X_LOCK (preadwritelock);
786 ooffset = lseek (fd, 0, SEEK_CUR);
787 lseek (fd, offset, SEEK_SET);
788 res = read (fd, buf, count);
789 lseek (fd, ooffset, SEEK_SET);
790 X_UNLOCK (preadwritelock);
791
792 return res;
793}
794
795static ssize_t
796eio__pwrite (int fd, void *buf, size_t count, off_t offset)
797{
798 ssize_t res;
799 off_t ooffset;
800
801 X_LOCK (preadwritelock);
802 ooffset = lseek (fd, 0, SEEK_CUR);
803 lseek (fd, offset, SEEK_SET);
804 res = write (fd, buf, count);
805 lseek (fd, ooffset, SEEK_SET);
806 X_UNLOCK (preadwritelock);
807
808 return res;
809}
810#endif
811
812#ifndef HAVE_FUTIMES 557#ifndef HAVE_UTIMES
813 558
814# undef utimes 559# undef utimes
815# undef futimes
816# define utimes(path,times) eio__utimes (path, times) 560# define utimes(path,times) eio__utimes (path, times)
817# define futimes(fd,times) eio__futimes (fd, times)
818 561
819static int 562static int
820eio__utimes (const char *filename, const struct timeval times[2]) 563eio__utimes (const char *filename, const struct timeval times[2])
821{ 564{
822 if (times) 565 if (times)
… …
830 } 573 }
831 else 574 else
832 return utime (filename, 0); 575 return utime (filename, 0);
833} 576}
834 577
578#endif
579
580#ifndef HAVE_FUTIMES
581
582# undef futimes
583# define futimes(fd,times) eio__futimes (fd, times)
584
585static int
835static int eio__futimes (int fd, const struct timeval tv[2]) 586eio__futimes (int fd, const struct timeval tv[2])
836{ 587{
837 errno = ENOSYS; 588 errno = ENOSYS;
838 return -1; 589 return -1;
839} 590}
840 591
… …
843#if !HAVE_FDATASYNC 594#if !HAVE_FDATASYNC
844# undef fdatasync 595# undef fdatasync
845# define fdatasync(fd) fsync (fd) 596# define fdatasync(fd) fsync (fd)
846#endif 597#endif
847 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}
615
848/* sync_file_range always needs emulation */ 616/* sync_file_range always needs emulation */
849int 617static int
850eio__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)
851{ 619{
852#if HAVE_SYNC_FILE_RANGE 620#if HAVE_SYNC_FILE_RANGE
853 int res; 621 int res;
854 622
… …
871 /* even though we could play tricks with the flags, it's better to always 639 /* even though we could play tricks with the flags, it's better to always
872 * call fdatasync, as that matches the expectation of its users best */ 640 * call fdatasync, as that matches the expectation of its users best */
873 return fdatasync (fd); 641 return fdatasync (fd);
874} 642}
875 643
644static int
645eio__fallocate (int fd, int mode, off_t offset, size_t len)
646{
647#if HAVE_LINUX_FALLOCATE
648 return fallocate (fd, mode, offset, len);
649#else
650 return EIO_ENOSYS ();
651#endif
652}
653
876#if !HAVE_READAHEAD 654#if !HAVE_READAHEAD
877# undef readahead 655# undef readahead
878# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self) 656# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
879 657
880static ssize_t 658static eio_ssize_t
881eio__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)
882{ 660{
883 size_t todo = count; 661 size_t todo = count;
884 dBUF; 662 dBUF;
885 663
… …
890 pread (fd, eio_buf, len, offset); 668 pread (fd, eio_buf, len, offset);
891 offset += len; 669 offset += len;
892 todo -= len; 670 todo -= len;
893 } 671 }
894 672
895 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 */
896 return count; 677 return 0;
897} 678}
898 679
899#endif 680#endif
900 681
901/* sendfile always needs emulation */ 682/* sendfile always needs emulation */
902static ssize_t 683static eio_ssize_t
903eio__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)
904{ 685{
686 eio_ssize_t written = 0;
905 ssize_t res; 687 eio_ssize_t res;
906 688
907 if (!count) 689 if (!count)
908 return 0; 690 return 0;
909 691
692 for (;;)
693 {
694#ifdef __APPLE__
695# undef HAVE_SENDFILE /* broken, as everything on os x */
696#endif
910#if HAVE_SENDFILE 697#if HAVE_SENDFILE
911# if __linux 698# if __linux
699 off_t soffset = offset;
912 res = sendfile (ofd, ifd, &offset, count); 700 res = sendfile (ofd, ifd, &soffset, count);
913 701
914# elif __freebsd 702# elif __FreeBSD__
915 /* 703 /*
916 * Of course, the freebsd sendfile is a dire hack with no thoughts 704 * Of course, the freebsd sendfile is a dire hack with no thoughts
917 * wasted on making it similar to other I/O functions. 705 * wasted on making it similar to other I/O functions.
918 */ 706 */
919 {
920 off_t sbytes; 707 off_t sbytes;
921 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 708 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
922 709
923 if (res < 0 && sbytes) 710 #if 0 /* according to the manpage, this is correct, but broken behaviour */
924 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */ 711 /* freebsd' sendfile will return 0 on success */
712 /* freebsd 8 documents it as only setting *sbytes on EINTR and EAGAIN, but */
713 /* not on e.g. EIO or EPIPE - sounds broken */
714 if ((res < 0 && (errno == EAGAIN || errno == EINTR) && sbytes) || res == 0)
925 res = sbytes; 715 res = sbytes;
926 } 716 #endif
927 717
718 /* according to source inspection, this is correct, and useful behaviour */
719 if (sbytes)
720 res = sbytes;
721
928# elif defined (__APPLE__) 722# elif defined __APPLE__
929
930 {
931 off_t sbytes = count; 723 off_t sbytes = count;
932 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 724 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
933 725
934 if (res < 0 && errno == EAGAIN && sbytes) 726 /* according to the manpage, sbytes is always valid */
727 if (sbytes)
935 res = sbytes; 728 res = sbytes;
936 }
937 729
938# elif __hpux 730# elif __hpux
939 res = sendfile (ofd, ifd, offset, count, 0, 0); 731 res = sendfile (ofd, ifd, offset, count, 0, 0);
940 732
941# elif __solaris 733# elif __solaris
942 {
943 struct sendfilevec vec; 734 struct sendfilevec vec;
944 size_t sbytes; 735 size_t sbytes;
945 736
946 vec.sfv_fd = ifd; 737 vec.sfv_fd = ifd;
947 vec.sfv_flag = 0; 738 vec.sfv_flag = 0;
948 vec.sfv_off = offset; 739 vec.sfv_off = offset;
949 vec.sfv_len = count; 740 vec.sfv_len = count;
950 741
951 res = sendfilev (ofd, &vec, 1, &sbytes); 742 res = sendfilev (ofd, &vec, 1, &sbytes);
952 743
953 if (res < 0 && sbytes) 744 if (res < 0 && sbytes)
954 res = sbytes; 745 res = sbytes;
955 }
956 746
957# endif 747# endif
958 748
959#elif defined (_WIN32) 749#elif defined (_WIN32) && 0
960
961 /* does not work, just for documentation of what would need to be done */ 750 /* does not work, just for documentation of what would need to be done */
962 { 751 /* actually, cannot be done like this, as TransmitFile changes the file offset, */
752 /* libeio guarantees that the file offset does not change, and windows */
753 /* has no way to get an independent handle to the same file description */
963 HANDLE h = TO_SOCKET (ifd); 754 HANDLE h = TO_SOCKET (ifd);
964 SetFilePointer (h, offset, 0, FILE_BEGIN); 755 SetFilePointer (h, offset, 0, FILE_BEGIN);
965 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0); 756 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
966 }
967 757
968#else 758#else
969 res = -1; 759 res = EIO_ENOSYS ();
970 errno = ENOSYS;
971#endif 760#endif
972 761
762 /* we assume sendfile can copy at least 128mb in one go */
763 if (res <= 128 * 1024 * 1024)
764 {
765 if (res > 0)
766 written += res;
767
768 if (written)
769 return written;
770
771 break;
772 }
773 else
774 {
775 /* if we requested more, then probably the kernel was lazy */
776 written += res;
777 offset += res;
778 count -= res;
779
780 if (!count)
781 return written;
782 }
783 }
784
973 if (res < 0 785 if (res < 0
974 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 786 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
975 /* BSDs */ 787 /* BSDs */
976#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... */
977 || errno == ENOTSUP 789 || errno == ENOTSUP
978#endif 790#endif
791#ifdef EOPNOTSUPP /* windows */
979 || errno == EOPNOTSUPP /* BSDs */ 792 || errno == EOPNOTSUPP /* BSDs */
793#endif
980#if __solaris 794#if __solaris
981 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 795 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
982#endif 796#endif
983 ) 797 )
984 ) 798 )
… …
988 802
989 res = 0; 803 res = 0;
990 804
991 while (count) 805 while (count)
992 { 806 {
993 ssize_t cnt; 807 eio_ssize_t cnt;
994 808
995 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);
996 810
997 if (cnt <= 0) 811 if (cnt <= 0)
998 { 812 {
… …
1010 824
1011 offset += cnt; 825 offset += cnt;
1012 res += cnt; 826 res += cnt;
1013 count -= cnt; 827 count -= cnt;
1014 } 828 }
829
830 FUBd;
1015 } 831 }
1016 832
1017 return res; 833 return res;
834}
835
836#ifdef PAGESIZE
837# define eio_pagesize() PAGESIZE
838#else
839static intptr_t
840eio_pagesize (void)
841{
842 static intptr_t page;
843
844 if (!page)
845 page = sysconf (_SC_PAGESIZE);
846
847 return page;
848}
849#endif
850
851static void
852eio_page_align (void **addr, size_t *length)
853{
854 intptr_t mask = eio_pagesize () - 1;
855
856 /* round down addr */
857 intptr_t adj = mask & (intptr_t)*addr;
858
859 *addr = (void *)((intptr_t)*addr - adj);
860 *length += adj;
861
862 /* round up length */
863 *length = (*length + mask) & ~mask;
864}
865
866#if !_POSIX_MEMLOCK
867# define eio__mlockall(a) EIO_ENOSYS ()
868#else
869
870static int
871eio__mlockall (int flags)
872{
873 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
874 extern int mallopt (int, int);
875 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
876 #endif
877
878 if (EIO_MCL_CURRENT != MCL_CURRENT
879 || EIO_MCL_FUTURE != MCL_FUTURE)
880 {
881 flags = 0
882 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
883 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
884 }
885
886 return mlockall (flags);
887}
888#endif
889
890#if !_POSIX_MEMLOCK_RANGE
891# define eio__mlock(a,b) EIO_ENOSYS ()
892#else
893
894static int
895eio__mlock (void *addr, size_t length)
896{
897 eio_page_align (&addr, &length);
898
899 return mlock (addr, length);
900}
901
902#endif
903
904#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
905# define eio__msync(a,b,c) EIO_ENOSYS ()
906#else
907
908static int
909eio__msync (void *mem, size_t len, int flags)
910{
911 eio_page_align (&mem, &len);
912
913 if (EIO_MS_ASYNC != MS_SYNC
914 || EIO_MS_INVALIDATE != MS_INVALIDATE
915 || EIO_MS_SYNC != MS_SYNC)
916 {
917 flags = 0
918 | (flags & EIO_MS_ASYNC ? MS_ASYNC : 0)
919 | (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
920 | (flags & EIO_MS_SYNC ? MS_SYNC : 0);
921 }
922
923 return msync (mem, len, flags);
924}
925
926#endif
927
928static int
929eio__mtouch (eio_req *req)
930{
931 void *mem = req->ptr2;
932 size_t len = req->size;
933 int flags = req->int1;
934
935 eio_page_align (&mem, &len);
936
937 {
938 intptr_t addr = (intptr_t)mem;
939 intptr_t end = addr + len;
940 intptr_t page = eio_pagesize ();
941
942 if (addr < end)
943 if (flags & EIO_MT_MODIFY) /* modify */
944 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len && !EIO_CANCELLED (req));
945 else
946 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len && !EIO_CANCELLED (req));
947 }
948
949 return 0;
950}
951
952/*****************************************************************************/
953/* requests implemented outside eio_execute, because they are so large */
954
955static void
956eio__lseek (eio_req *req)
957{
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{
973 char *res;
974 const char *rel = path;
975 char *tmp1, *tmp2;
976#if SYMLOOP_MAX > 32
977 int symlinks = SYMLOOP_MAX;
978#else
979 int symlinks = 32;
980#endif
981
982 errno = EINVAL;
983 if (!rel)
984 return -1;
985
986 errno = ENOENT;
987 if (!*rel)
988 return -1;
989
990 res = tmpbuf_get (tmpbuf, PATH_MAX * 3);
991#ifdef _WIN32
992 if (_access (rel, 4) != 0)
993 return -1;
994
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
1008 tmp1 = res + PATH_MAX;
1009 tmp2 = tmp1 + PATH_MAX;
1010
1011#if 0 /* disabled, the musl way to do things is just too racy */
1012#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1013 /* on linux we may be able to ask the kernel */
1014 {
1015 int fd = open (rel, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOATIME);
1016
1017 if (fd >= 0)
1018 {
1019 sprintf (tmp1, "/proc/self/fd/%d", fd);
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 */
1022 close (fd);
1023
1024 if (req->result > 0)
1025 goto done;
1026 }
1027 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO)
1028 return -1;
1029 }
1030#endif
1031#endif
1032
1033 if (*rel != '/')
1034 {
1035 int len;
1036
1037 errno = ENOENT;
1038 if (wd == EIO_INVALID_WD)
1039 return -1;
1040
1041 if (wd == EIO_CWD)
1042 {
1043 if (!getcwd (res, PATH_MAX))
1044 return -1;
1045
1046 len = strlen (res);
1047 }
1048 else
1049 memcpy (res, wd->str, len = wd->len);
1050
1051 if (res [1]) /* only use if not / */
1052 res += len;
1053 }
1054
1055 while (*rel)
1056 {
1057 eio_ssize_t len, linklen;
1058 const char *beg = rel;
1059
1060 while (*rel && *rel != '/')
1061 ++rel;
1062
1063 len = rel - beg;
1064
1065 if (!len) /* skip slashes */
1066 {
1067 ++rel;
1068 continue;
1069 }
1070
1071 if (beg [0] == '.')
1072 {
1073 if (len == 1)
1074 continue; /* . - nop */
1075
1076 if (beg [1] == '.' && len == 2)
1077 {
1078 /* .. - back up one component, if possible */
1079
1080 while (res != tmpbuf->ptr)
1081 if (*--res == '/')
1082 break;
1083
1084 continue;
1085 }
1086 }
1087
1088 errno = ENAMETOOLONG;
1089 if (res + 1 + len + 1 >= tmp1)
1090 return -1;
1091
1092 /* copy one component */
1093 *res = '/';
1094 memcpy (res + 1, beg, len);
1095
1096 /* zero-terminate, for readlink */
1097 res [len + 1] = 0;
1098
1099 /* now check if it's a symlink */
1100 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1101
1102 if (linklen < 0)
1103 {
1104 if (errno != EINVAL)
1105 return -1;
1106
1107 /* it's a normal directory. hopefully */
1108 res += len + 1;
1109 }
1110 else
1111 {
1112 /* yay, it was a symlink - build new path in tmp2 */
1113 int rellen = strlen (rel);
1114
1115 errno = ENAMETOOLONG;
1116 if (linklen + 1 + rellen >= PATH_MAX)
1117 return -1;
1118
1119 errno = ELOOP;
1120 if (!--symlinks)
1121 return -1;
1122
1123 if (*tmp1 == '/')
1124 res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1125
1126 /* we need to be careful, as rel might point into tmp2 already */
1127 memmove (tmp2 + linklen + 1, rel, rellen + 1);
1128 tmp2 [linklen] = '/';
1129 memcpy (tmp2, tmp1, linklen);
1130
1131 rel = tmp2;
1132 }
1133 }
1134
1135 /* special case for the lone root path */
1136 if (res == tmpbuf->ptr)
1137 *res++ = '/';
1138
1139 return res - (char *)tmpbuf->ptr;
1140#endif
1018} 1141}
1019 1142
1020static signed char 1143static signed char
1021eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1144eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1022{ 1145{
1023 return a->score - b->score ? a->score - b->score /* works because our signed char is always 0..100 */ 1146 return a->score - b->score ? a->score - b->score /* works because our signed char is always 0..100 */
1024 : a->inode < b->inode ? -1 : a->inode > b->inode ? 1 : 0; 1147 : a->inode < b->inode ? -1
1148 : a->inode > b->inode ? 1
1149 : 0;
1025} 1150}
1026 1151
1027#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0 1152#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0
1028 1153
1029#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 */
1030#define EIO_SORT_FAST 60 /* when to only use insertion sort */ 1155#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1031 1156
1032static void 1157static void
1033eio_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)
1034{ 1159{
1035 unsigned char bits [9 + sizeof (ino_t) * 8]; 1160 unsigned char bits [9 + sizeof (eio_ino_t) * 8];
1036 unsigned char *bit = bits; 1161 unsigned char *bit = bits;
1037 1162
1038 assert (CHAR_BIT == 8); 1163 assert (CHAR_BIT == 8);
1039 assert (sizeof (eio_dirent) * 8 < 256); 1164 assert (sizeof (eio_dirent) * 8 < 256);
1040 assert (offsetof (eio_dirent, inode)); /* we use 0 as sentinel */ 1165 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
1041 assert (offsetof (eio_dirent, score)); /* we use 0 as sentinel */ 1166 assert (offsetof (eio_dirent, score)); /* we use bit #0 as sentinel */
1042 1167
1043 if (size <= EIO_SORT_FAST) 1168 if (size <= EIO_SORT_FAST)
1044 return; 1169 return;
1045 1170
1046 /* 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 */
1047 /* 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 */
1048 /* inode_bits must contain all inodes ORed together */ 1173 /* inode_bits must contain all inodes ORed together */
1049 /* 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 */
1050 { 1175 {
1051 ino_t endianness; 1176 eio_ino_t endianness;
1052 int i, j; 1177 int i, j;
1053 1178
1054 /* 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" */
1055 for (i = 0; i < sizeof (ino_t); ++i) 1180 for (i = 0; i < sizeof (eio_ino_t); ++i)
1056 ((unsigned char *)&endianness)[i] = i; 1181 ((unsigned char *)&endianness)[i] = i;
1057 1182
1058 *bit++ = 0; 1183 *bit++ = 0;
1059 1184
1060 for (i = 0; i < sizeof (ino_t); ++i) 1185 for (i = 0; i < sizeof (eio_ino_t); ++i)
1061 { 1186 {
1062 /* shifting off the byte offsets out of "endianness" */ 1187 /* shifting off the byte offsets out of "endianness" */
1063 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8; 1188 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1064 endianness >>= 8; 1189 endianness >>= 8;
1065 1190
1066 for (j = 0; j < 8; ++j) 1191 for (j = 0; j < 8; ++j)
1067 if (inode_bits & (((ino_t)1) << (i * 8 + j))) 1192 if (inode_bits & (((eio_ino_t)1) << (i * 8 + j)))
1068 *bit++ = offs + j; 1193 *bit++ = offs + j;
1069 } 1194 }
1070 1195
1071 for (j = 0; j < 8; ++j) 1196 for (j = 0; j < 8; ++j)
1072 if (score_bits & (1 << j)) 1197 if (score_bits & (1 << j))
1073 *bit++ = offsetof (eio_dirent, score) * 8 + j; 1198 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1074 } 1199 }
1075 1200
1076 /* now actually do the sorting (a variant of MSD radix sort) */ 1201 /* now actually do the sorting (a variant of MSD radix sort) */
1077 { 1202 {
1078 eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base; 1203 eio_dirent *base_stk [9 + sizeof (eio_ino_t) * 8], *base;
1079 eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end; 1204 eio_dirent *end_stk [9 + sizeof (eio_ino_t) * 8], *end;
1080 unsigned char *bit_stk [9 + sizeof (ino_t) * 8]; 1205 unsigned char *bit_stk [9 + sizeof (eio_ino_t) * 8];
1081 int stk_idx = 0; 1206 int stk_idx = 0;
1082 1207
1083 base_stk [stk_idx] = dents; 1208 base_stk [stk_idx] = dents;
1084 end_stk [stk_idx] = dents + size; 1209 end_stk [stk_idx] = dents + size;
1085 bit_stk [stk_idx] = bit - 1; 1210 bit_stk [stk_idx] = bit - 1;
… …
1164 } 1289 }
1165 } 1290 }
1166} 1291}
1167 1292
1168static void 1293static void
1169eio_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)
1170{ 1295{
1171 if (size <= 1) 1296 if (size <= 1)
1172 return; /* our insertion sort relies on size > 0 */ 1297 return; /* our insertion sort relies on size > 0 */
1173 1298
1174 /* 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 */
… …
1182 1307
1183/* read a full directory */ 1308/* read a full directory */
1184static void 1309static void
1185eio__scandir (eio_req *req, etp_worker *self) 1310eio__scandir (eio_req *req, etp_worker *self)
1186{ 1311{
1187 DIR *dirp;
1188 EIO_STRUCT_DIRENT *entp;
1189 char *name, *names; 1312 char *name, *names;
1190 int namesalloc = 4096; 1313 int namesalloc = 4096 - sizeof (void *) * 4;
1191 int namesoffs = 0; 1314 int namesoffs = 0;
1192 int flags = req->int1; 1315 int flags = req->int1;
1193 eio_dirent *dents = 0; 1316 eio_dirent *dents = 0;
1194 int dentalloc = 128; 1317 int dentalloc = 128;
1195 int dentoffs = 0; 1318 int dentoffs = 0;
1196 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
1197 1327
1198 req->result = -1; 1328 req->result = -1;
1199 1329
1200 if (!(flags & EIO_READDIR_DENTS)) 1330 if (!(flags & EIO_READDIR_DENTS))
1201 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1331 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1202 1332
1203 X_LOCK (wrklock); 1333#ifdef _WIN32
1204 /* 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
1205 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
1401
1402 if (req->flags & EIO_FLAG_PTR1_FREE)
1403 free (req->ptr1);
1404
1206 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1405 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1207 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1406 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1208 req->ptr2 = names = malloc (namesalloc); 1407 req->ptr2 = names = malloc (namesalloc);
1209 X_UNLOCK (wrklock);
1210 1408
1211 if (dirp && names && (!flags || dents)) 1409 if (!names || (flags && !dents))
1410 return;
1411
1212 for (;;) 1412 for (;;)
1213 { 1413 {
1414 int done;
1415
1416#ifdef _WIN32
1417 done = !dirp;
1418#else
1214 errno = 0; 1419 errno = 0;
1215 entp = readdir (dirp); 1420 entp = readdir (dirp);
1421 done = !entp;
1422#endif
1216 1423
1217 if (!entp) 1424 if (done)
1218 { 1425 {
1426#ifndef _WIN32
1427 int old_errno = errno;
1428 closedir (dirp);
1429 errno = old_errno;
1430
1219 if (errno) 1431 if (errno)
1220 break; 1432 break;
1433#endif
1221 1434
1222 /* sort etc. */ 1435 /* sort etc. */
1223 req->int1 = flags; 1436 req->int1 = flags;
1224 req->result = dentoffs; 1437 req->result = dentoffs;
1225 1438
1226 if (flags & EIO_READDIR_STAT_ORDER) 1439 if (flags & EIO_READDIR_STAT_ORDER)
1227 eio_dent_sort (dents, dentoffs, 0, inode_bits); /* sort by inode exclusively */ 1440 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1228 else if (flags & EIO_READDIR_DIRS_FIRST) 1441 else if (flags & EIO_READDIR_DIRS_FIRST)
1229 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1442 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1230 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 */
1231 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))
1232 { 1495 {
1233 /* 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
1234 eio_dirent *oth = dents + dentoffs; 1503 ent = dents + dentoffs;
1235 eio_dirent *dir = dents;
1236 1504
1237 /* 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 */
1238 /* by walking from both sides and swapping if necessary */ 1506 ent->namelen = len - 1;
1239 /* also clear score, so it doesn't influence sorting */ 1507 ent->inode = D_INO (entp);
1240 while (oth > dir) 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)
1241 { 1567 {
1242 if (dir->type == EIO_DT_DIR) 1568 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1243 ++dir; 1569 ent->score = 1;
1244 else if ((--oth)->type == EIO_DT_DIR) 1570 else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1245 { 1571 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1246 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1247
1248 ++dir;
1249 }
1250 } 1572 }
1251 1573 else if (ent->type == EIO_DT_DIR)
1252 /* now sort the dirs only */ 1574 ent->score = 0;
1253 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1254 } 1575 }
1255
1256 break;
1257 }
1258
1259 /* now add the entry to our list(s) */
1260 name = entp->d_name;
1261
1262 /* skip . and .. entries */
1263 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1264 {
1265 int len = D_NAMLEN (entp) + 1;
1266
1267 while (expect_false (namesoffs + len > namesalloc))
1268 {
1269 namesalloc *= 2;
1270 X_LOCK (wrklock);
1271 req->ptr2 = names = realloc (names, namesalloc);
1272 X_UNLOCK (wrklock);
1273
1274 if (!names)
1275 break;
1276 } 1576 }
1277 1577
1278 memcpy (names + namesoffs, name, len);
1279
1280 if (dents)
1281 {
1282 struct eio_dirent *ent;
1283
1284 if (expect_false (dentoffs == dentalloc))
1285 {
1286 dentalloc *= 2;
1287 X_LOCK (wrklock);
1288 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1289 X_UNLOCK (wrklock);
1290
1291 if (!dents)
1292 break;
1293 }
1294
1295 ent = dents + dentoffs;
1296
1297 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1298 ent->namelen = len - 1;
1299 ent->inode = D_INO (entp);
1300
1301 inode_bits |= ent->inode;
1302
1303 switch (D_TYPE (entp))
1304 {
1305 default:
1306 ent->type = EIO_DT_UNKNOWN;
1307 flags |= EIO_READDIR_FOUND_UNKNOWN;
1308 break;
1309
1310 #ifdef DT_FIFO
1311 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1312 #endif
1313 #ifdef DT_CHR
1314 case DT_CHR: ent->type = EIO_DT_CHR; break;
1315 #endif
1316 #ifdef DT_MPC
1317 case DT_MPC: ent->type = EIO_DT_MPC; break;
1318 #endif
1319 #ifdef DT_DIR
1320 case DT_DIR: ent->type = EIO_DT_DIR; break;
1321 #endif
1322 #ifdef DT_NAM
1323 case DT_NAM: ent->type = EIO_DT_NAM; break;
1324 #endif
1325 #ifdef DT_BLK
1326 case DT_BLK: ent->type = EIO_DT_BLK; break;
1327 #endif
1328 #ifdef DT_MPB
1329 case DT_MPB: ent->type = EIO_DT_MPB; break;
1330 #endif
1331 #ifdef DT_REG
1332 case DT_REG: ent->type = EIO_DT_REG; break;
1333 #endif
1334 #ifdef DT_NWK
1335 case DT_NWK: ent->type = EIO_DT_NWK; break;
1336 #endif
1337 #ifdef DT_CMP
1338 case DT_CMP: ent->type = EIO_DT_CMP; break;
1339 #endif
1340 #ifdef DT_LNK
1341 case DT_LNK: ent->type = EIO_DT_LNK; break;
1342 #endif
1343 #ifdef DT_SOCK
1344 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1345 #endif
1346 #ifdef DT_DOOR
1347 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1348 #endif
1349 #ifdef DT_WHT
1350 case DT_WHT: ent->type = EIO_DT_WHT; break;
1351 #endif
1352 }
1353
1354 ent->score = 7;
1355
1356 if (flags & EIO_READDIR_DIRS_FIRST)
1357 {
1358 if (ent->type == EIO_DT_UNKNOWN)
1359 {
1360 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1361 ent->score = 1;
1362 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1363 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1364 }
1365 else if (ent->type == EIO_DT_DIR)
1366 ent->score = 0;
1367 }
1368 }
1369
1370 namesoffs += len; 1578 namesoffs += len;
1371 ++dentoffs; 1579 ++dentoffs;
1372 } 1580 }
1373 1581
1374 if (EIO_CANCELLED (req)) 1582 if (EIO_CANCELLED (req))
1375 { 1583 {
1376 errno = ECANCELED; 1584 errno = ECANCELED;
1377 break; 1585 break;
1378 } 1586 }
1587
1588#ifdef _WIN32
1589 if (!FindNextFile (dirp, &entp))
1590 {
1591 FindClose (dirp);
1592 dirp = 0;
1379 } 1593 }
1594#endif
1595 }
1380} 1596}
1381 1597
1382#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 1598/*****************************************************************************/
1383# define eio__msync(a,b,c) ((errno = ENOSYS), -1) 1599/* working directory stuff */
1384#else 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. */
1385 1603
1386int 1604#if !HAVE_AT
1387eio__msync (void *mem, size_t len, int flags) 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)
1388{ 1610{
1389 if (EIO_MS_ASYNC != MS_SYNC 1611 if (!wd || *path == '/')
1390 || EIO_MS_INVALIDATE != MS_INVALIDATE 1612 return path;
1391 || EIO_MS_SYNC != MS_SYNC) 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)
1392 { 1677 {
1393 flags = 0 1678 #if HAVE_AT
1394 | (flags & EIO_MS_ASYNC ? MS_ASYNC : 0) 1679 close (wd->fd);
1395 | (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0) 1680 #endif
1396 | (flags & EIO_MS_SYNC ? MS_SYNC : 0); 1681 free (wd);
1397 } 1682 }
1398
1399 return msync (mem, len, flags);
1400} 1683}
1401 1684
1402#endif 1685#if HAVE_AT
1403 1686
1404int 1687/* they forgot these */
1405eio__mtouch (void *mem, size_t len, int flags)
1406{
1407 intptr_t addr = (intptr_t)mem;
1408 intptr_t end = addr + len;
1409#ifdef PAGESIZE
1410 const intptr_t page = PAGESIZE;
1411#else
1412 static intptr_t page;
1413 1688
1414 if (!page) 1689static int
1415 page = sysconf (_SC_PAGESIZE); 1690eio__truncateat (int dirfd, const char *path, off_t length)
1416#endif 1691{
1692 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
1693 int res;
1417 1694
1418 /* round down to start of page, although this is probably useless */ 1695 if (fd < 0)
1419 addr &= ~(page - 1); /* assume page size is always a power of two */ 1696 return fd;
1420 1697
1421 if (addr < end) 1698 res = ftruncate (fd, length);
1422 if (flags & EIO_MT_MODIFY) /* modify */ 1699 close (fd);
1423 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len);
1424 else
1425 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len);
1426
1427 return 0; 1700 return res;
1428} 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
1429 1719
1430/*****************************************************************************/ 1720/*****************************************************************************/
1431 1721
1432#define ALLOC(len) \ 1722#define ALLOC(len) \
1433 if (!req->ptr2) \ 1723 if (!req->ptr2) \
… …
1442 req->result = -1; \ 1732 req->result = -1; \
1443 break; \ 1733 break; \
1444 } \ 1734 } \
1445 } 1735 }
1446 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 */
1447X_THREAD_PROC (etp_proc) 1755X_THREAD_PROC (etp_proc)
1448{ 1756{
1449 ETP_REQ *req; 1757 ETP_REQ *req;
1450 struct timespec ts; 1758 struct timespec ts;
1451 etp_worker *self = (etp_worker *)thr_arg; 1759 etp_worker *self = (etp_worker *)thr_arg;
1452 1760
1761 etp_proc_init ();
1762
1453 /* try to distribute timeouts somewhat randomly */ 1763 /* try to distribute timeouts somewhat evenly */
1454 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 1764 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1455 1765
1456 for (;;) 1766 for (;;)
1457 { 1767 {
1768 ts.tv_sec = 0;
1769
1458 X_LOCK (reqlock); 1770 X_LOCK (reqlock);
1459 1771
1460 for (;;) 1772 for (;;)
1461 { 1773 {
1462 self->req = req = reqq_shift (&req_queue); 1774 req = reqq_shift (&req_queue);
1463 1775
1464 if (req) 1776 if (req)
1465 break; 1777 break;
1466 1778
1779 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
1780 {
1781 X_UNLOCK (reqlock);
1782 X_LOCK (wrklock);
1783 --started;
1784 X_UNLOCK (wrklock);
1785 goto quit;
1786 }
1787
1467 ++idle; 1788 ++idle;
1468 1789
1469 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1790 if (idle <= max_idle)
1470 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) 1791 /* we are allowed to idle, so do so without any timeout */
1792 X_COND_WAIT (reqwait, reqlock);
1793 else
1471 { 1794 {
1472 if (idle > max_idle) 1795 /* initialise timeout once */
1473 { 1796 if (!ts.tv_sec)
1474 --idle; 1797 ts.tv_sec = time (0) + idle_timeout;
1475 X_UNLOCK (reqlock);
1476 X_LOCK (wrklock);
1477 --started;
1478 X_UNLOCK (wrklock);
1479 goto quit;
1480 }
1481 1798
1482 /* we are allowed to idle, so do so without any timeout */
1483 X_COND_WAIT (reqwait, reqlock); 1799 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1800 ts.tv_sec = 1; /* assuming this is not a value computed above.,.. */
1484 } 1801 }
1485 1802
1486 --idle; 1803 --idle;
1487 } 1804 }
1488 1805
1489 --nready; 1806 --nready;
1490 1807
1491 X_UNLOCK (reqlock); 1808 X_UNLOCK (reqlock);
1492 1809
1493 if (req->type < 0) 1810 if (req->type == ETP_TYPE_QUIT)
1494 goto quit; 1811 goto quit;
1495 1812
1496 if (!EIO_CANCELLED (req))
1497 ETP_EXECUTE (self, req); 1813 ETP_EXECUTE (self, req);
1498 1814
1499 X_LOCK (reslock); 1815 X_LOCK (reslock);
1500 1816
1501 ++npending; 1817 ++npending;
1502 1818
1503 if (!reqq_push (&res_queue, req) && want_poll_cb) 1819 if (!reqq_push (&res_queue, req) && want_poll_cb)
1504 want_poll_cb (); 1820 want_poll_cb ();
1505 1821
1506 self->req = 0;
1507 etp_worker_clear (self); 1822 etp_worker_clear (self);
1508 1823
1509 X_UNLOCK (reslock); 1824 X_UNLOCK (reslock);
1510 } 1825 }
1511 1826
1512quit: 1827quit:
1828 free (req);
1829
1513 X_LOCK (wrklock); 1830 X_LOCK (wrklock);
1514 etp_worker_free (self); 1831 etp_worker_free (self);
1515 X_UNLOCK (wrklock); 1832 X_UNLOCK (wrklock);
1516 1833
1517 return 0; 1834 return 0;
1518} 1835}
1519 1836
1520/*****************************************************************************/ 1837/*****************************************************************************/
1521 1838
1839int ecb_cold
1522int eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1840eio_init (void (*want_poll)(void), void (*done_poll)(void))
1523{ 1841{
1524 return etp_init (want_poll, done_poll); 1842 return etp_init (want_poll, done_poll);
1525} 1843}
1526 1844
1845ecb_inline void
1527static void eio_api_destroy (eio_req *req) 1846eio_api_destroy (eio_req *req)
1528{ 1847{
1529 free (req); 1848 free (req);
1530} 1849}
1531 1850
1532#define REQ(rtype) \ 1851#define REQ(rtype) \
1533 eio_req *req; \ 1852 eio_req *req; \
1534 \ 1853 \
1535 req = (eio_req *)calloc (1, sizeof *req); \ 1854 req = (eio_req *)calloc (1, sizeof *req); \
1536 if (!req) \ 1855 if (!req) \
1537 return 0; \ 1856 return 0; \
1538 \ 1857 \
1539 req->type = rtype; \ 1858 req->type = rtype; \
1540 req->pri = pri; \ 1859 req->pri = pri; \
1541 req->finish = cb; \ 1860 req->finish = cb; \
1542 req->data = data; \ 1861 req->data = data; \
1862 req->result = -1; \
1863 req->errorno = ECANCELED; \
1543 req->destroy = eio_api_destroy; 1864 req->destroy = eio_api_destroy;
1544 1865
1545#define SEND eio_submit (req); return req 1866#define SEND eio_submit (req); return req
1546 1867
1547#define PATH \ 1868#define PATH \
… …
1551 { \ 1872 { \
1552 eio_api_destroy (req); \ 1873 eio_api_destroy (req); \
1553 return 0; \ 1874 return 0; \
1554 } 1875 }
1555 1876
1877#define SINGLEDOT(ptr) (0[(char *)(ptr)] == '.' && !1[(char *)(ptr)])
1878
1879static void
1556static void eio_execute (etp_worker *self, eio_req *req) 1880eio_execute (etp_worker *self, eio_req *req)
1557{ 1881{
1558 errno = 0; 1882#if HAVE_AT
1883 int dirfd;
1884#else
1885 const char *path;
1886#endif
1887
1888 if (ecb_expect_false (EIO_CANCELLED (req)))
1889 {
1890 req->result = -1;
1891 req->errorno = ECANCELED;
1892 return;
1893 }
1894
1895 if (ecb_expect_false (req->wd == EIO_INVALID_WD))
1896 {
1897 req->result = -1;
1898 req->errorno = ENOENT;
1899 return;
1900 }
1901
1902 if (req->type >= EIO_OPEN)
1903 {
1904 #if HAVE_AT
1905 dirfd = WD2FD (req->wd);
1906 #else
1907 path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1908 #endif
1909 }
1559 1910
1560 switch (req->type) 1911 switch (req->type)
1561 { 1912 {
1913 case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
1914 req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
1915 break;
1916 case EIO_WD_CLOSE: req->result = 0;
1917 eio_wd_close_sync (req->wd); break;
1918
1919 case EIO_SEEK: eio__lseek (req); break;
1562 case EIO_READ: ALLOC (req->size); 1920 case EIO_READ: ALLOC (req->size);
1563 req->result = req->offs >= 0 1921 req->result = req->offs >= 0
1564 ? pread (req->int1, req->ptr2, req->size, req->offs) 1922 ? pread (req->int1, req->ptr2, req->size, req->offs)
1565 : read (req->int1, req->ptr2, req->size); break; 1923 : read (req->int1, req->ptr2, req->size); break;
1566 case EIO_WRITE: req->result = req->offs >= 0 1924 case EIO_WRITE: req->result = req->offs >= 0
1567 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 1925 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1568 : write (req->int1, req->ptr2, req->size); break; 1926 : write (req->int1, req->ptr2, req->size); break;
1569 1927
1570 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 1928 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1571 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break; 1929 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
1930
1931#if HAVE_AT
1572 1932
1573 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1933 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1574 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 1934 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
1575 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1935 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1576 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 1936 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
1577 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1578 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1579
1580 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break; 1937 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
1581 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1582 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break; 1938 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
1583 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
1584 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break; 1939 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
1585 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1586
1587 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break; 1940 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
1588 case EIO_CLOSE: req->result = close (req->int1); break; 1941
1589 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
1590 case EIO_UNLINK: req->result = unlink (req->ptr1); break; 1942 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
1591 case EIO_RMDIR: req->result = rmdir (req->ptr1); break; 1943 case EIO_RMDIR: /* complications arise because "." cannot be removed, so we might have to expand */
1944 req->result = req->wd && SINGLEDOT (req->ptr1)
1945 ? rmdir (req->wd->str)
1946 : unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
1592 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break; 1947 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
1593 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break; 1948 case EIO_RENAME: /* complications arise because "." cannot be renamed, so we might have to expand */
1949 req->result = req->wd && SINGLEDOT (req->ptr1)
1950 ? rename (req->wd->str, req->ptr2)
1951 : renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
1594 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break; 1952 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
1595 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break; 1953 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
1596 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->int3); break; 1954 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1597
1598 case EIO_READLINK: ALLOC (NAME_MAX); 1955 case EIO_READLINK: ALLOC (PATH_MAX);
1599 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break; 1956 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
1600 1957 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1601 case EIO_SYNC: req->result = 0; sync (); break; 1958 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1602 case EIO_FSYNC: req->result = fsync (req->int1); break;
1603 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1604 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
1605 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;
1606 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1607
1608 case EIO_READDIR: eio__scandir (req, self); break;
1609
1610 case EIO_BUSY: 1959 case EIO_UTIME:
1611#ifdef _WIN32 1960 case EIO_FUTIME:
1612 Sleep (req->nv1 * 1000.); 1961 {
1962 struct timespec ts[2];
1963 struct timespec *times;
1964
1965 if (req->nv1 != -1. || req->nv2 != -1.)
1966 {
1967 ts[0].tv_sec = req->nv1;
1968 ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
1969 ts[1].tv_sec = req->nv2;
1970 ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
1971
1972 times = ts;
1973 }
1974 else
1975 times = 0;
1976
1977 req->result = req->type == EIO_FUTIME
1978 ? futimens (req->int1, times)
1979 : utimensat (dirfd, req->ptr1, times, 0);
1980 }
1981 break;
1982
1613#else 1983#else
1614 {
1615 struct timeval tv;
1616 1984
1617 tv.tv_sec = req->nv1; 1985 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1618 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.; 1986 req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
1987 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1988 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
1989 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
1990 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
1991 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
1992 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
1619 1993
1620 req->result = select (0, 0, 0, 0, &tv); 1994 case EIO_UNLINK: req->result = unlink (path ); break;
1621 } 1995 case EIO_RMDIR: req->result = rmdir (path ); break;
1622#endif 1996 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
1623 break; 1997 case EIO_RENAME: req->result = rename (path , req->ptr2); break;
1998 case EIO_LINK: req->result = link (path , req->ptr2); break;
1999 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
2000 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
2001 case EIO_READLINK: ALLOC (PATH_MAX);
2002 req->result = readlink (path, req->ptr2, PATH_MAX); break;
2003 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2004 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
1624 2005
1625 case EIO_UTIME: 2006 case EIO_UTIME:
1626 case EIO_FUTIME: 2007 case EIO_FUTIME:
1627 { 2008 {
1628 struct timeval tv[2]; 2009 struct timeval tv[2];
1629 struct timeval *times; 2010 struct timeval *times;
1630 2011
1631 if (req->nv1 != -1. || req->nv2 != -1.) 2012 if (req->nv1 != -1. || req->nv2 != -1.)
1632 { 2013 {
1633 tv[0].tv_sec = req->nv1; 2014 tv[0].tv_sec = req->nv1;
1634 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.; 2015 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
1635 tv[1].tv_sec = req->nv2; 2016 tv[1].tv_sec = req->nv2;
1636 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.; 2017 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
1637 2018
1638 times = tv; 2019 times = tv;
1639 } 2020 }
1640 else 2021 else
1641 times = 0; 2022 times = 0;
1642
1643 2023
1644 req->result = req->type == EIO_FUTIME 2024 req->result = req->type == EIO_FUTIME
1645 ? futimes (req->int1, times) 2025 ? futimes (req->int1, times)
1646 : utimes (req->ptr1, times); 2026 : utimes (req->ptr1, times);
1647 } 2027 }
1648 break; 2028 break;
1649 2029
2030#endif
2031
2032 case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
2033 {
2034 ALLOC (req->result);
2035 memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
2036 }
2037 break;
2038
2039 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2040 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
2041
2042 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2043 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2044
2045 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
2046 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
2047 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2048
2049 case EIO_CLOSE: req->result = close (req->int1); break;
2050 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
2051 case EIO_SYNC: req->result = 0; sync (); break;
2052 case EIO_FSYNC: req->result = fsync (req->int1); break;
2053 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2054 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
2055 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2056 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
2057 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2058 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2059 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2060 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2061
2062 case EIO_READDIR: eio__scandir (req, self); break;
2063
2064 case EIO_BUSY:
2065#ifdef _WIN32
2066 Sleep (req->nv1 * 1e3);
2067#else
2068 {
2069 struct timeval tv;
2070
2071 tv.tv_sec = req->nv1;
2072 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1e6;
2073
2074 req->result = select (0, 0, 0, 0, &tv);
2075 }
2076#endif
2077 break;
2078
1650 case EIO_GROUP: 2079 case EIO_GROUP:
1651 abort (); /* handled in eio_request */ 2080 abort (); /* handled in eio_request */
1652 2081
1653 case EIO_NOP: 2082 case EIO_NOP:
1654 req->result = 0; 2083 req->result = 0;
1655 break; 2084 break;
1656 2085
1657 case EIO_CUSTOM: 2086 case EIO_CUSTOM:
1658 ((void (*)(eio_req *))req->feed) (req); 2087 req->feed (req);
1659 break; 2088 break;
1660 2089
1661 default: 2090 default:
1662 req->result = -1; 2091 req->result = EIO_ENOSYS ();
1663 break; 2092 break;
1664 } 2093 }
1665 2094
1666 req->errorno = errno; 2095 req->errorno = errno;
1667} 2096}
1668 2097
1669#ifndef EIO_NO_WRAPPERS 2098#ifndef EIO_NO_WRAPPERS
1670 2099
2100eio_req *eio_wd_open (const char *path, int pri, eio_cb cb, void *data)
2101{
2102 REQ (EIO_WD_OPEN); PATH; SEND;
2103}
2104
2105eio_req *eio_wd_close (eio_wd wd, int pri, eio_cb cb, void *data)
2106{
2107 REQ (EIO_WD_CLOSE); req->wd = wd; SEND;
2108}
2109
1671eio_req *eio_nop (int pri, eio_cb cb, void *data) 2110eio_req *eio_nop (int pri, eio_cb cb, void *data)
1672{ 2111{
1673 REQ (EIO_NOP); SEND; 2112 REQ (EIO_NOP); SEND;
1674} 2113}
1675 2114
… …
1691eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2130eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1692{ 2131{
1693 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2132 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1694} 2133}
1695 2134
2135eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2136{
2137 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2138}
2139
2140eio_req *eio_syncfs (int fd, int pri, eio_cb cb, void *data)
2141{
2142 REQ (EIO_SYNCFS); req->int1 = fd; SEND;
2143}
2144
2145eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2146{
2147 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2148}
2149
1696eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2150eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1697{ 2151{
1698 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2152 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1699} 2153}
1700 2154
1701eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data) 2155eio_req *eio_mlock (void *addr, size_t length, int pri, eio_cb cb, void *data)
1702{ 2156{
1703 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND; 2157 REQ (EIO_MLOCK); req->ptr2 = addr; req->size = length; SEND;
1704} 2158}
1705 2159
1706eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data) 2160eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
1707{ 2161{
1708 REQ (EIO_FDATASYNC); req->int1 = fd; SEND; 2162 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2163}
2164
2165eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
2166{
2167 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
1709} 2168}
1710 2169
1711eio_req *eio_close (int fd, int pri, eio_cb cb, void *data) 2170eio_req *eio_close (int fd, int pri, eio_cb cb, void *data)
1712{ 2171{
1713 REQ (EIO_CLOSE); req->int1 = fd; SEND; 2172 REQ (EIO_CLOSE); req->int1 = fd; SEND;
… …
1716eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data) 2175eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data)
1717{ 2176{
1718 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND; 2177 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND;
1719} 2178}
1720 2179
2180eio_req *eio_seek (int fd, off_t offset, int whence, int pri, eio_cb cb, void *data)
2181{
2182 REQ (EIO_SEEK); req->int1 = fd; req->offs = offset; req->int2 = whence; SEND;
2183}
2184
1721eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data) 2185eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
1722{ 2186{
1723 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND; 2187 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
1724} 2188}
1725 2189
… …
1731eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data) 2195eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data)
1732{ 2196{
1733 REQ (EIO_FSTAT); req->int1 = fd; SEND; 2197 REQ (EIO_FSTAT); req->int1 = fd; SEND;
1734} 2198}
1735 2199
2200eio_req *eio_fstatvfs (int fd, int pri, eio_cb cb, void *data)
2201{
2202 REQ (EIO_FSTATVFS); req->int1 = fd; SEND;
2203}
2204
1736eio_req *eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void *data) 2205eio_req *eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void *data)
1737{ 2206{
1738 REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND; 2207 REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND;
1739} 2208}
1740 2209
… …
1746eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data) 2215eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data)
1747{ 2216{
1748 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND; 2217 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND;
1749} 2218}
1750 2219
1751eio_req *eio_fchown (int fd, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data) 2220eio_req *eio_fchown (int fd, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
1752{ 2221{
1753 REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND; 2222 REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
1754} 2223}
1755 2224
1756eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data) 2225eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data)
… …
1776eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data) 2245eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data)
1777{ 2246{
1778 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND; 2247 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND;
1779} 2248}
1780 2249
1781eio_req *eio_chown (const char *path, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data) 2250eio_req *eio_chown (const char *path, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
1782{ 2251{
1783 REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND; 2252 REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
1784} 2253}
1785 2254
1786eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data) 2255eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data)
… …
1802eio_req *eio_readlink (const char *path, int pri, eio_cb cb, void *data) 2271eio_req *eio_readlink (const char *path, int pri, eio_cb cb, void *data)
1803{ 2272{
1804 return eio__1path (EIO_READLINK, path, pri, cb, data); 2273 return eio__1path (EIO_READLINK, path, pri, cb, data);
1805} 2274}
1806 2275
2276eio_req *eio_realpath (const char *path, int pri, eio_cb cb, void *data)
2277{
2278 return eio__1path (EIO_REALPATH, path, pri, cb, data);
2279}
2280
1807eio_req *eio_stat (const char *path, int pri, eio_cb cb, void *data) 2281eio_req *eio_stat (const char *path, int pri, eio_cb cb, void *data)
1808{ 2282{
1809 return eio__1path (EIO_STAT, path, pri, cb, data); 2283 return eio__1path (EIO_STAT, path, pri, cb, data);
1810} 2284}
1811 2285
1812eio_req *eio_lstat (const char *path, int pri, eio_cb cb, void *data) 2286eio_req *eio_lstat (const char *path, int pri, eio_cb cb, void *data)
1813{ 2287{
1814 return eio__1path (EIO_LSTAT, path, pri, cb, data); 2288 return eio__1path (EIO_LSTAT, path, pri, cb, data);
1815} 2289}
1816 2290
2291eio_req *eio_statvfs (const char *path, int pri, eio_cb cb, void *data)
2292{
2293 return eio__1path (EIO_STATVFS, path, pri, cb, data);
2294}
2295
1817eio_req *eio_unlink (const char *path, int pri, eio_cb cb, void *data) 2296eio_req *eio_unlink (const char *path, int pri, eio_cb cb, void *data)
1818{ 2297{
1819 return eio__1path (EIO_UNLINK, path, pri, cb, data); 2298 return eio__1path (EIO_UNLINK, path, pri, cb, data);
1820} 2299}
1821 2300
… …
1829 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND; 2308 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;
1830} 2309}
1831 2310
1832eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data) 2311eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1833{ 2312{
1834 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND; 2313 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->offs = (off_t)dev; SEND;
1835} 2314}
1836 2315
1837static eio_req * 2316static eio_req *
1838eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data) 2317eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1839{ 2318{
… …
1863eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data) 2342eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1864{ 2343{
1865 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 2344 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
1866} 2345}
1867 2346
1868eio_req *eio_custom (eio_cb execute, int pri, eio_cb cb, void *data) 2347eio_req *eio_custom (void (*execute)(eio_req *), int pri, eio_cb cb, void *data)
1869{ 2348{
1870 REQ (EIO_CUSTOM); req->feed = (void (*)(eio_req *))execute; SEND; 2349 REQ (EIO_CUSTOM); req->feed = execute; SEND;
1871} 2350}
1872 2351
1873#endif 2352#endif
1874 2353
1875eio_req *eio_grp (eio_cb cb, void *data) 2354eio_req *eio_grp (eio_cb cb, void *data)
… …
1884#undef SEND 2363#undef SEND
1885 2364
1886/*****************************************************************************/ 2365/*****************************************************************************/
1887/* grp functions */ 2366/* grp functions */
1888 2367
2368void
1889void eio_grp_feed (eio_req *grp, void (*feed)(eio_req *req), int limit) 2369eio_grp_feed (eio_req *grp, void (*feed)(eio_req *req), int limit)
1890{ 2370{
1891 grp->int2 = limit; 2371 grp->int2 = limit;
1892 grp->feed = feed; 2372 grp->feed = feed;
1893 2373
1894 grp_try_feed (grp); 2374 grp_try_feed (grp);
1895} 2375}
1896 2376
2377void
1897void eio_grp_limit (eio_req *grp, int limit) 2378eio_grp_limit (eio_req *grp, int limit)
1898{ 2379{
1899 grp->int2 = limit; 2380 grp->int2 = limit;
1900 2381
1901 grp_try_feed (grp); 2382 grp_try_feed (grp);
1902} 2383}
1903 2384
2385void
1904void eio_grp_add (eio_req *grp, eio_req *req) 2386eio_grp_add (eio_req *grp, eio_req *req)
1905{ 2387{
1906 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2)); 2388 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
1907 2389
1908 grp->flags |= EIO_FLAG_GROUPADD; 2390 grp->flags |= EIO_FLAG_GROUPADD;
1909 2391
… …
1920} 2402}
1921 2403
1922/*****************************************************************************/ 2404/*****************************************************************************/
1923/* misc garbage */ 2405/* misc garbage */
1924 2406
2407eio_ssize_t
1925ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2408eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
1926{ 2409{
1927 etp_worker wrk;
1928 ssize_t ret;
1929
1930 wrk.dbuf = 0;
1931
1932 ret = eio__sendfile (ofd, ifd, offset, count, &wrk); 2410 return eio__sendfile (ofd, ifd, offset, count);
1933
1934 if (wrk.dbuf)
1935 free (wrk.dbuf);
1936
1937 return ret;
1938} 2411}
1939 2412

Diff Legend

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