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

Comparing libeio/eio.c (file contents):
Revision 1.31 by root, Sat Jun 6 17:25:13 2009 UTC vs.
Revision 1.89 by root, Thu Jul 14 22:36:17 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines