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

Diff Legend

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