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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines