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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines