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

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.33 by root, Sat Jun 6 19:44:17 2009 UTC vs.
Revision 1.105 by root, Mon Sep 26 18:23:18 2011 UTC

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

Diff Legend

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