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

Comparing libeio/eio.c (file contents):
Revision 1.97 by root, Sun Jul 24 03:32:54 2011 UTC vs.
Revision 1.139 by root, Thu Jun 25 18:14:19 2015 UTC

1/* 1/*
2 * libeio implementation 2 * libeio implementation
3 * 3 *
4 * Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libeio@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010,2011,2012,2013 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 *
10 * 1. Redistributions of source code must retain the above copyright notice, 10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer. 11 * this list of conditions and the following disclaimer.
12 * 12 *
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution. 15 * documentation and/or other materials provided with the distribution.
16 * 16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- 18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- 20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
43 43
44#include "eio.h" 44#include "eio.h"
45#include "ecb.h" 45#include "ecb.h"
46 46
47#ifdef EIO_STACKSIZE 47#ifdef EIO_STACKSIZE
48# define XTHREAD_STACKSIZE EIO_STACKSIZE 48# define X_STACKSIZE EIO_STACKSIZE
49#endif 49#endif
50#include "xthread.h" 50#include "xthread.h"
51 51
52#include <errno.h> 52#include <errno.h>
53#include <stddef.h> 53#include <stddef.h>
105#ifdef _WIN32 105#ifdef _WIN32
106 106
107 #undef PAGESIZE 107 #undef PAGESIZE
108 #define PAGESIZE 4096 /* GetSystemInfo? */ 108 #define PAGESIZE 4096 /* GetSystemInfo? */
109 109
110 /* TODO: look at how perl does stat (non-sloppy), unlink (ro-files), utime, link */
111
110 #ifdef EIO_STRUCT_STATI64 112 #ifdef EIO_STRUCT_STATI64
113 /* look at perl's non-sloppy stat */
111 #define stat(path,buf) _stati64 (path,buf) 114 #define stat(path,buf) _stati64 (path,buf)
112 #define fstat(fd,buf) _fstati64 (fd,buf) 115 #define fstat(fd,buf) _fstati64 (fd,buf)
113 #endif 116 #endif
114 #define lstat(path,buf) stat (path,buf) 117 #define lstat(path,buf) stat (path,buf)
115 #define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1)) 118 #define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))
117 #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1)) 120 #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))
118 121
119 #define chmod(path,mode) _chmod (path, mode) 122 #define chmod(path,mode) _chmod (path, mode)
120 #define dup(fd) _dup (fd) 123 #define dup(fd) _dup (fd)
121 #define dup2(fd1,fd2) _dup2 (fd1, fd2) 124 #define dup2(fd1,fd2) _dup2 (fd1, fd2)
125 #define pipe(fds) _pipe (fds, 4096, O_BINARY)
122 126
123 #define fchmod(fd,mode) EIO_ENOSYS () 127 #define fchmod(fd,mode) EIO_ENOSYS ()
124 #define chown(path,uid,gid) EIO_ENOSYS () 128 #define chown(path,uid,gid) EIO_ENOSYS ()
125 #define fchown(fd,uid,gid) EIO_ENOSYS () 129 #define fchown(fd,uid,gid) EIO_ENOSYS ()
126 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */ 130 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
129 #define sync() EIO_ENOSYS () 133 #define sync() EIO_ENOSYS ()
130 #define readlink(path,buf,s) EIO_ENOSYS () 134 #define readlink(path,buf,s) EIO_ENOSYS ()
131 #define statvfs(path,buf) EIO_ENOSYS () 135 #define statvfs(path,buf) EIO_ENOSYS ()
132 #define fstatvfs(fd,buf) EIO_ENOSYS () 136 #define fstatvfs(fd,buf) EIO_ENOSYS ()
133 137
138 #define pread(fd,buf,count,offset) eio__pread (fd, buf, count, offset)
139 #define pwrite(fd,buf,count,offset) eio__pwrite (fd, buf, count, offset)
140
141 #if __GNUC__
142 typedef long long eio_off_t; /* signed for compatibility to msvc */
143 #else
144 typedef __int64 eio_off_t; /* unsigned not supported by msvc */
145 #endif
146
147 static eio_ssize_t
148 eio__pread (int fd, void *buf, eio_ssize_t count, eio_off_t offset)
149 {
150 OVERLAPPED o = { 0 };
151 DWORD got;
152
153 o.Offset = offset;
154 o.OffsetHigh = offset >> 32;
155
156 return ReadFile ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd), buf, count, &got, &o)
157 ? got : -1;
158 }
159
160 static eio_ssize_t
161 eio__pwrite (int fd, void *buf, eio_ssize_t count, eio_off_t offset)
162 {
163 OVERLAPPED o = { 0 };
164 DWORD got;
165
166 o.Offset = offset;
167 o.OffsetHigh = offset >> 32;
168
169 return WriteFile ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd), buf, count, &got, &o)
170 ? got : -1;
171 }
172
173 /* rename() uses MoveFile, which fails to overwrite */
174 #define rename(old,neu) eio__rename (old, neu)
175
176 static int
177 eio__rename (const char *old, const char *neu)
178 {
179 if (MoveFileEx (old, neu, MOVEFILE_REPLACE_EXISTING))
180 return 0;
181
182 /* should steal _dosmaperr */
183 switch (GetLastError ())
184 {
185 case ERROR_FILE_NOT_FOUND:
186 case ERROR_PATH_NOT_FOUND:
187 case ERROR_INVALID_DRIVE:
188 case ERROR_NO_MORE_FILES:
189 case ERROR_BAD_NETPATH:
190 case ERROR_BAD_NET_NAME:
191 case ERROR_BAD_PATHNAME:
192 case ERROR_FILENAME_EXCED_RANGE:
193 errno = ENOENT;
194 break;
195
196 default:
197 errno = EACCES;
198 break;
199 }
200
201 return -1;
202 }
203
134 /* we could even stat and see if it exists */ 204 /* we could even stat and see if it exists */
135 static int 205 static int
136 symlink (const char *old, const char *neu) 206 symlink (const char *old, const char *neu)
137 { 207 {
138 #if WINVER >= 0x0600 208 #if WINVER >= 0x0600
144 #endif 214 #endif
145 215
146 return EIO_ERRNO (ENOENT, -1); 216 return EIO_ERRNO (ENOENT, -1);
147 } 217 }
148 218
149 /* POSIX API only */ 219 /* POSIX API only, causing trouble for win32 apps */
150 #define CreateHardLink(neu,old,flags) 0 220 #define CreateHardLink(neu,old,flags) 0 /* not really creating hardlink, still using relative paths? */
151 #define CreateSymbolicLink(neu,old,flags) 0 221 #define CreateSymbolicLink(neu,old,flags) 0 /* vista+ only */
152 222
153 struct statvfs 223 struct statvfs
154 { 224 {
155 int dummy; 225 int dummy;
156 }; 226 };
162 232
163#else 233#else
164 234
165 #include <sys/time.h> 235 #include <sys/time.h>
166 #include <sys/select.h> 236 #include <sys/select.h>
167 #include <sys/statvfs.h>
168 #include <unistd.h> 237 #include <unistd.h>
169 #include <signal.h> 238 #include <signal.h>
170 #include <dirent.h> 239 #include <dirent.h>
171 240
241 #ifdef ANDROID
242 #include <sys/vfs.h>
243 #define statvfs statfs
244 #define fstatvfs fstatfs
245 #include <asm/page.h> /* supposedly limits.h does #define PAGESIZE PAGESIZE */
246 #else
247 #include <sys/statvfs.h>
248 #endif
249
172 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES 250 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
173 #include <sys/mman.h> 251 #include <sys/mman.h>
174 #endif 252 #endif
175 253
176 #define D_NAME(entp) entp->d_name 254 #define D_NAME(entp) entp->d_name
177 255
178 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */ 256 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
179 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 257 #if __FreeBSD__ || __NetBSD__ || __OpenBSD__
180 #define _DIRENT_HAVE_D_TYPE /* sigh */ 258 #define _DIRENT_HAVE_D_TYPE /* sigh */
181 #define D_INO(de) (de)->d_fileno 259 #define D_INO(de) (de)->d_fileno
182 #define D_NAMLEN(de) (de)->d_namlen 260 #define D_NAMLEN(de) (de)->d_namlen
183 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600 261 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
184 #define D_INO(de) (de)->d_ino 262 #define D_INO(de) (de)->d_ino
199 277
200#endif 278#endif
201 279
202#if HAVE_UTIMES 280#if HAVE_UTIMES
203# include <utime.h> 281# include <utime.h>
282#endif
283
284#if HAVE_SYS_SYSCALL_H
285# include <sys/syscall.h>
286#endif
287
288#if HAVE_SYS_PRCTL_H
289# include <sys/prctl.h>
204#endif 290#endif
205 291
206#if HAVE_SENDFILE 292#if HAVE_SENDFILE
207# if __linux 293# if __linux
208# include <sys/sendfile.h> 294# include <sys/sendfile.h>
216# else 302# else
217# error sendfile support requested but not available 303# error sendfile support requested but not available
218# endif 304# endif
219#endif 305#endif
220 306
221#if HAVE_SYS_SYSCALL_H
222# include <sys/syscall.h>
223#endif
224
225#ifndef D_TYPE 307#ifndef D_TYPE
226# define D_TYPE(de) 0 308# define D_TYPE(de) 0
227#endif 309#endif
228#ifndef D_INO 310#ifndef D_INO
229# define D_INO(de) 0 311# define D_INO(de) 0
243#endif 325#endif
244 326
245/* buffer size for various temporary buffers */ 327/* buffer size for various temporary buffers */
246#define EIO_BUFSIZE 65536 328#define EIO_BUFSIZE 65536
247 329
248#define dBUF \ 330#define dBUF \
249 char *eio_buf = malloc (EIO_BUFSIZE); \ 331 char *eio_buf = malloc (EIO_BUFSIZE); \
250 errno = ENOMEM; \ 332 errno = ENOMEM; \
251 if (!eio_buf) \ 333 if (!eio_buf) \
252 return -1 334 return -1
253 335
254#define FUBd \ 336#define FUBd \
255 free (eio_buf) 337 free (eio_buf)
256 338
257#define EIO_TICKS ((1000000 + 1023) >> 10) 339/*****************************************************************************/
340
341struct etp_tmpbuf;
342
343#if _POSIX_VERSION >= 200809L
344 #define HAVE_AT 1
345 #define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD)
346 #ifndef O_SEARCH
347 #define O_SEARCH O_RDONLY
348 #endif
349#else
350 #define HAVE_AT 0
351 static const char *wd_expand (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path);
352#endif
353
354struct eio_pwd
355{
356#if HAVE_AT
357 int fd;
358#endif
359 int len;
360 char str[1]; /* actually, a 0-terminated canonical path */
361};
362
363/*****************************************************************************/
258 364
259#define ETP_PRI_MIN EIO_PRI_MIN 365#define ETP_PRI_MIN EIO_PRI_MIN
260#define ETP_PRI_MAX EIO_PRI_MAX 366#define ETP_PRI_MAX EIO_PRI_MAX
261 367
368#define ETP_TYPE_QUIT -1
369#define ETP_TYPE_GROUP EIO_GROUP
370
371static void eio_nop_callback (void) { }
372static void (*eio_want_poll_cb)(void) = eio_nop_callback;
373static void (*eio_done_poll_cb)(void) = eio_nop_callback;
374
375#define ETP_WANT_POLL(pool) eio_want_poll_cb ()
376#define ETP_DONE_POLL(pool) eio_done_poll_cb ()
377
262struct etp_worker; 378struct etp_worker;
263
264#define ETP_REQ eio_req 379#define ETP_REQ eio_req
265#define ETP_DESTROY(req) eio_destroy (req) 380#define ETP_DESTROY(req) eio_destroy (req)
266static int eio_finish (eio_req *req); 381static int eio_finish (eio_req *req);
267#define ETP_FINISH(req) eio_finish (req) 382#define ETP_FINISH(req) eio_finish (req)
268static void eio_execute (struct etp_worker *self, eio_req *req); 383static void eio_execute (struct etp_worker *self, eio_req *req);
269#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 384#define ETP_EXECUTE(wrk,req) eio_execute (wrk, req)
270 385
271/*****************************************************************************/ 386#include "etp.c"
272 387
273#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 388static struct etp_pool eio_pool;
274 389#define EIO_POOL (&eio_pool)
275/* calculate time difference in ~1/EIO_TICKS of a second */
276ecb_inline int
277tvdiff (struct timeval *tv1, struct timeval *tv2)
278{
279 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
280 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
281}
282
283static unsigned int started, idle, wanted = 4;
284
285static void (*want_poll_cb) (void);
286static void (*done_poll_cb) (void);
287
288static unsigned int max_poll_time; /* reslock */
289static unsigned int max_poll_reqs; /* reslock */
290
291static volatile unsigned int nreqs; /* reqlock */
292static volatile unsigned int nready; /* reqlock */
293static volatile unsigned int npending; /* reqlock */
294static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
295static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
296
297static xmutex_t wrklock;
298static xmutex_t reslock;
299static xmutex_t reqlock;
300static xcond_t reqwait;
301
302#if !HAVE_PREADWRITE
303/*
304 * make our pread/pwrite emulation safe against themselves, but not against
305 * normal read/write by using a mutex. slows down execution a lot,
306 * but that's your problem, not mine.
307 */
308static xmutex_t preadwritelock;
309#endif
310
311typedef struct etp_worker
312{
313 /* locked by wrklock */
314 struct etp_worker *prev, *next;
315
316 xthread_t tid;
317
318 /* locked by reslock, reqlock or wrklock */
319 ETP_REQ *req; /* currently processed request */
320
321#ifdef ETP_WORKER_COMMON
322 ETP_WORKER_COMMON
323#endif
324} etp_worker;
325
326static etp_worker wrk_first; /* NOT etp */
327
328#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
329#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
330
331/* worker threads management */
332
333static void ecb_cold
334etp_worker_clear (etp_worker *wrk)
335{
336}
337
338static void ecb_cold
339etp_worker_free (etp_worker *wrk)
340{
341 wrk->next->prev = wrk->prev;
342 wrk->prev->next = wrk->next;
343
344 free (wrk);
345}
346
347static unsigned int
348etp_nreqs (void)
349{
350 int retval;
351 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
352 retval = nreqs;
353 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
354 return retval;
355}
356
357static unsigned int
358etp_nready (void)
359{
360 unsigned int retval;
361
362 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
363 retval = nready;
364 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
365
366 return retval;
367}
368
369static unsigned int
370etp_npending (void)
371{
372 unsigned int retval;
373
374 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
375 retval = npending;
376 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
377
378 return retval;
379}
380
381static unsigned int
382etp_nthreads (void)
383{
384 unsigned int retval;
385
386 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
387 retval = started;
388 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
389
390 return retval;
391}
392
393/*
394 * a somewhat faster data structure might be nice, but
395 * with 8 priorities this actually needs <20 insns
396 * per shift, the most expensive operation.
397 */
398typedef struct {
399 ETP_REQ *qs[ETP_NUM_PRI], *qe[ETP_NUM_PRI]; /* qstart, qend */
400 int size;
401} etp_reqq;
402
403static etp_reqq req_queue;
404static etp_reqq res_queue;
405
406static void ecb_noinline ecb_cold
407reqq_init (etp_reqq *q)
408{
409 int pri;
410
411 for (pri = 0; pri < ETP_NUM_PRI; ++pri)
412 q->qs[pri] = q->qe[pri] = 0;
413
414 q->size = 0;
415}
416
417static int ecb_noinline
418reqq_push (etp_reqq *q, ETP_REQ *req)
419{
420 int pri = req->pri;
421 req->next = 0;
422
423 if (q->qe[pri])
424 {
425 q->qe[pri]->next = req;
426 q->qe[pri] = req;
427 }
428 else
429 q->qe[pri] = q->qs[pri] = req;
430
431 return q->size++;
432}
433
434static ETP_REQ * ecb_noinline
435reqq_shift (etp_reqq *q)
436{
437 int pri;
438
439 if (!q->size)
440 return 0;
441
442 --q->size;
443
444 for (pri = ETP_NUM_PRI; pri--; )
445 {
446 eio_req *req = q->qs[pri];
447
448 if (req)
449 {
450 if (!(q->qs[pri] = (eio_req *)req->next))
451 q->qe[pri] = 0;
452
453 return req;
454 }
455 }
456
457 abort ();
458}
459
460static int ecb_cold
461etp_init (void (*want_poll)(void), void (*done_poll)(void))
462{
463 X_MUTEX_CREATE (wrklock);
464 X_MUTEX_CREATE (reslock);
465 X_MUTEX_CREATE (reqlock);
466 X_COND_CREATE (reqwait);
467
468 reqq_init (&req_queue);
469 reqq_init (&res_queue);
470
471 wrk_first.next =
472 wrk_first.prev = &wrk_first;
473
474 started = 0;
475 idle = 0;
476 nreqs = 0;
477 nready = 0;
478 npending = 0;
479
480 want_poll_cb = want_poll;
481 done_poll_cb = done_poll;
482
483 return 0;
484}
485
486X_THREAD_PROC (etp_proc);
487
488static void ecb_cold
489etp_start_thread (void)
490{
491 etp_worker *wrk = calloc (1, sizeof (etp_worker));
492
493 /*TODO*/
494 assert (("unable to allocate worker thread data", wrk));
495
496 X_LOCK (wrklock);
497
498 if (thread_create (&wrk->tid, etp_proc, (void *)wrk))
499 {
500 wrk->prev = &wrk_first;
501 wrk->next = wrk_first.next;
502 wrk_first.next->prev = wrk;
503 wrk_first.next = wrk;
504 ++started;
505 }
506 else
507 free (wrk);
508
509 X_UNLOCK (wrklock);
510}
511
512static void
513etp_maybe_start_thread (void)
514{
515 if (ecb_expect_true (etp_nthreads () >= wanted))
516 return;
517
518 /* todo: maybe use idle here, but might be less exact */
519 if (ecb_expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
520 return;
521
522 etp_start_thread ();
523}
524
525static void ecb_cold
526etp_end_thread (void)
527{
528 eio_req *req = calloc (1, sizeof (eio_req));
529
530 req->type = -1;
531 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
532
533 X_LOCK (reqlock);
534 reqq_push (&req_queue, req);
535 X_COND_SIGNAL (reqwait);
536 X_UNLOCK (reqlock);
537
538 X_LOCK (wrklock);
539 --started;
540 X_UNLOCK (wrklock);
541}
542
543static int
544etp_poll (void)
545{
546 unsigned int maxreqs;
547 unsigned int maxtime;
548 struct timeval tv_start, tv_now;
549
550 X_LOCK (reslock);
551 maxreqs = max_poll_reqs;
552 maxtime = max_poll_time;
553 X_UNLOCK (reslock);
554
555 if (maxtime)
556 gettimeofday (&tv_start, 0);
557
558 for (;;)
559 {
560 ETP_REQ *req;
561
562 etp_maybe_start_thread ();
563
564 X_LOCK (reslock);
565 req = reqq_shift (&res_queue);
566
567 if (req)
568 {
569 --npending;
570
571 if (!res_queue.size && done_poll_cb)
572 done_poll_cb ();
573 }
574
575 X_UNLOCK (reslock);
576
577 if (!req)
578 return 0;
579
580 X_LOCK (reqlock);
581 --nreqs;
582 X_UNLOCK (reqlock);
583
584 if (ecb_expect_false (req->type == EIO_GROUP && req->size))
585 {
586 req->int1 = 1; /* mark request as delayed */
587 continue;
588 }
589 else
590 {
591 int res = ETP_FINISH (req);
592 if (ecb_expect_false (res))
593 return res;
594 }
595
596 if (ecb_expect_false (maxreqs && !--maxreqs))
597 break;
598
599 if (maxtime)
600 {
601 gettimeofday (&tv_now, 0);
602
603 if (tvdiff (&tv_start, &tv_now) >= maxtime)
604 break;
605 }
606 }
607
608 errno = EAGAIN;
609 return -1;
610}
611
612static void
613etp_cancel (ETP_REQ *req)
614{
615 req->cancelled = 1;
616
617 eio_grp_cancel (req);
618}
619
620static void
621etp_submit (ETP_REQ *req)
622{
623 req->pri -= ETP_PRI_MIN;
624
625 if (ecb_expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
626 if (ecb_expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
627
628 if (ecb_expect_false (req->type == EIO_GROUP))
629 {
630 /* I hope this is worth it :/ */
631 X_LOCK (reqlock);
632 ++nreqs;
633 X_UNLOCK (reqlock);
634
635 X_LOCK (reslock);
636
637 ++npending;
638
639 if (!reqq_push (&res_queue, req) && want_poll_cb)
640 want_poll_cb ();
641
642 X_UNLOCK (reslock);
643 }
644 else
645 {
646 X_LOCK (reqlock);
647 ++nreqs;
648 ++nready;
649 reqq_push (&req_queue, req);
650 X_COND_SIGNAL (reqwait);
651 X_UNLOCK (reqlock);
652
653 etp_maybe_start_thread ();
654 }
655}
656
657static void ecb_cold
658etp_set_max_poll_time (double nseconds)
659{
660 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
661 max_poll_time = nseconds * EIO_TICKS;
662 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
663}
664
665static void ecb_cold
666etp_set_max_poll_reqs (unsigned int maxreqs)
667{
668 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
669 max_poll_reqs = maxreqs;
670 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
671}
672
673static void ecb_cold
674etp_set_max_idle (unsigned int nthreads)
675{
676 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
677 max_idle = nthreads;
678 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
679}
680
681static void ecb_cold
682etp_set_idle_timeout (unsigned int seconds)
683{
684 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
685 idle_timeout = seconds;
686 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
687}
688
689static void ecb_cold
690etp_set_min_parallel (unsigned int nthreads)
691{
692 if (wanted < nthreads)
693 wanted = nthreads;
694}
695
696static void ecb_cold
697etp_set_max_parallel (unsigned int nthreads)
698{
699 if (wanted > nthreads)
700 wanted = nthreads;
701
702 while (started > wanted)
703 etp_end_thread ();
704}
705 390
706/*****************************************************************************/ 391/*****************************************************************************/
707 392
708static void 393static void
709grp_try_feed (eio_req *grp) 394grp_try_feed (eio_req *grp)
710{ 395{
711 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 396 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
712 { 397 {
713 grp->flags &= ~EIO_FLAG_GROUPADD; 398 grp->flags &= ~ETP_FLAG_GROUPADD;
714 399
715 EIO_FEED (grp); 400 EIO_FEED (grp);
716 401
717 /* stop if no progress has been made */ 402 /* stop if no progress has been made */
718 if (!(grp->flags & EIO_FLAG_GROUPADD)) 403 if (!(grp->flags & ETP_FLAG_GROUPADD))
719 { 404 {
720 grp->feed = 0; 405 grp->feed = 0;
721 break; 406 break;
722 } 407 }
723 } 408 }
730 415
731 /* call feeder, if applicable */ 416 /* call feeder, if applicable */
732 grp_try_feed (grp); 417 grp_try_feed (grp);
733 418
734 /* finish, if done */ 419 /* finish, if done */
735 if (!grp->size && grp->int1) 420 if (!grp->size && grp->flags & ETP_FLAG_DELAYED)
736 return eio_finish (grp); 421 return eio_finish (grp);
737 else 422 else
738 return 0; 423 return 0;
739} 424}
740 425
776} 461}
777 462
778void 463void
779eio_grp_cancel (eio_req *grp) 464eio_grp_cancel (eio_req *grp)
780{ 465{
781 for (grp = grp->grp_first; grp; grp = grp->grp_next) 466 etp_grp_cancel (EIO_POOL, grp);
782 eio_cancel (grp);
783} 467}
784 468
785void 469void
786eio_cancel (eio_req *req) 470eio_cancel (eio_req *req)
787{ 471{
788 etp_cancel (req); 472 etp_cancel (EIO_POOL, req);
789} 473}
790 474
791void 475void
792eio_submit (eio_req *req) 476eio_submit (eio_req *req)
793{ 477{
794 etp_submit (req); 478 etp_submit (EIO_POOL, req);
795} 479}
796 480
797unsigned int 481unsigned int
798eio_nreqs (void) 482eio_nreqs (void)
799{ 483{
800 return etp_nreqs (); 484 return etp_nreqs (EIO_POOL);
801} 485}
802 486
803unsigned int 487unsigned int
804eio_nready (void) 488eio_nready (void)
805{ 489{
806 return etp_nready (); 490 return etp_nready (EIO_POOL);
807} 491}
808 492
809unsigned int 493unsigned int
810eio_npending (void) 494eio_npending (void)
811{ 495{
812 return etp_npending (); 496 return etp_npending (EIO_POOL);
813} 497}
814 498
815unsigned int ecb_cold 499unsigned int ecb_cold
816eio_nthreads (void) 500eio_nthreads (void)
817{ 501{
818 return etp_nthreads (); 502 return etp_nthreads (EIO_POOL);
819} 503}
820 504
821void ecb_cold 505void ecb_cold
822eio_set_max_poll_time (double nseconds) 506eio_set_max_poll_time (double nseconds)
823{ 507{
824 etp_set_max_poll_time (nseconds); 508 etp_set_max_poll_time (EIO_POOL, nseconds);
825} 509}
826 510
827void ecb_cold 511void ecb_cold
828eio_set_max_poll_reqs (unsigned int maxreqs) 512eio_set_max_poll_reqs (unsigned int maxreqs)
829{ 513{
830 etp_set_max_poll_reqs (maxreqs); 514 etp_set_max_poll_reqs (EIO_POOL, maxreqs);
831} 515}
832 516
833void ecb_cold 517void ecb_cold
834eio_set_max_idle (unsigned int nthreads) 518eio_set_max_idle (unsigned int nthreads)
835{ 519{
836 etp_set_max_idle (nthreads); 520 etp_set_max_idle (EIO_POOL, nthreads);
837} 521}
838 522
839void ecb_cold 523void ecb_cold
840eio_set_idle_timeout (unsigned int seconds) 524eio_set_idle_timeout (unsigned int seconds)
841{ 525{
842 etp_set_idle_timeout (seconds); 526 etp_set_idle_timeout (EIO_POOL, seconds);
843} 527}
844 528
845void ecb_cold 529void ecb_cold
846eio_set_min_parallel (unsigned int nthreads) 530eio_set_min_parallel (unsigned int nthreads)
847{ 531{
848 etp_set_min_parallel (nthreads); 532 etp_set_min_parallel (EIO_POOL, nthreads);
849} 533}
850 534
851void ecb_cold 535void ecb_cold
852eio_set_max_parallel (unsigned int nthreads) 536eio_set_max_parallel (unsigned int nthreads)
853{ 537{
854 etp_set_max_parallel (nthreads); 538 etp_set_max_parallel (EIO_POOL, nthreads);
855} 539}
856 540
857int eio_poll (void) 541int eio_poll (void)
858{ 542{
859 return etp_poll (); 543 return etp_poll (EIO_POOL);
860} 544}
861 545
862/*****************************************************************************/ 546/*****************************************************************************/
863/* work around various missing functions */ 547/* work around various missing functions */
864
865#if !HAVE_PREADWRITE
866# undef pread
867# undef pwrite
868# define pread eio__pread
869# define pwrite eio__pwrite
870
871static eio_ssize_t
872eio__pread (int fd, void *buf, size_t count, off_t offset)
873{
874 eio_ssize_t res;
875 off_t ooffset;
876
877 X_LOCK (preadwritelock);
878 ooffset = lseek (fd, 0, SEEK_CUR);
879 lseek (fd, offset, SEEK_SET);
880 res = read (fd, buf, count);
881 lseek (fd, ooffset, SEEK_SET);
882 X_UNLOCK (preadwritelock);
883
884 return res;
885}
886
887static eio_ssize_t
888eio__pwrite (int fd, void *buf, size_t count, off_t offset)
889{
890 eio_ssize_t res;
891 off_t ooffset;
892
893 X_LOCK (preadwritelock);
894 ooffset = lseek (fd, 0, SEEK_CUR);
895 lseek (fd, offset, SEEK_SET);
896 res = write (fd, buf, count);
897 lseek (fd, ooffset, SEEK_SET);
898 X_UNLOCK (preadwritelock);
899
900 return res;
901}
902#endif
903 548
904#ifndef HAVE_UTIMES 549#ifndef HAVE_UTIMES
905 550
906# undef utimes 551# undef utimes
907# define utimes(path,times) eio__utimes (path, times) 552# define utimes(path,times) eio__utimes (path, times)
949 int res; 594 int res;
950 595
951#if HAVE_SYS_SYNCFS 596#if HAVE_SYS_SYNCFS
952 res = (int)syscall (__NR_syncfs, (int)(fd)); 597 res = (int)syscall (__NR_syncfs, (int)(fd));
953#else 598#else
954 res = -1; 599 res = EIO_ENOSYS ();
955 errno = ENOSYS;
956#endif 600#endif
957 601
958 if (res < 0 && errno == ENOSYS && fd >= 0) 602 if (res < 0 && errno == ENOSYS && fd >= 0)
959 sync (); 603 sync ();
960 604
990} 634}
991 635
992static int 636static int
993eio__fallocate (int fd, int mode, off_t offset, size_t len) 637eio__fallocate (int fd, int mode, off_t offset, size_t len)
994{ 638{
995#if HAVE_FALLOCATE 639#if HAVE_LINUX_FALLOCATE
996 return fallocate (fd, mode, offset, len); 640 return fallocate (fd, mode, offset, len);
997#else 641#else
998 errno = ENOSYS; 642 return EIO_ENOSYS ();
999 return -1;
1000#endif 643#endif
1001} 644}
1002 645
1003#if !HAVE_READAHEAD 646#if !HAVE_READAHEAD
1004# undef readahead 647# undef readahead
1019 todo -= len; 662 todo -= len;
1020 } 663 }
1021 664
1022 FUBd; 665 FUBd;
1023 666
1024 errno = 0; 667 /* linux's readahead basically only fails for EBADF or EINVAL (not mmappable) */
668 /* but not for e.g. EIO or eof, so we also never fail */
1025 return count; 669 return 0;
1026} 670}
1027 671
1028#endif 672#endif
1029 673
1030/* sendfile always needs emulation */ 674/* sendfile always needs emulation */
1065 709
1066 /* according to source inspection, this is correct, and useful behaviour */ 710 /* according to source inspection, this is correct, and useful behaviour */
1067 if (sbytes) 711 if (sbytes)
1068 res = sbytes; 712 res = sbytes;
1069 713
1070# elif defined (__APPLE__) 714# elif defined __APPLE__
1071 off_t sbytes = count; 715 off_t sbytes = count;
1072 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 716 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1073 717
1074 /* according to the manpage, sbytes is always valid */ 718 /* according to the manpage, sbytes is always valid */
1075 if (sbytes) 719 if (sbytes)
1102 HANDLE h = TO_SOCKET (ifd); 746 HANDLE h = TO_SOCKET (ifd);
1103 SetFilePointer (h, offset, 0, FILE_BEGIN); 747 SetFilePointer (h, offset, 0, FILE_BEGIN);
1104 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0); 748 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1105 749
1106#else 750#else
1107 res = -1; 751 res = EIO_ENOSYS ();
1108 errno = ENOSYS;
1109#endif 752#endif
1110 753
1111 /* we assume sendfile can copy at least 128mb in one go */ 754 /* we assume sendfile can copy at least 128mb in one go */
1112 if (res <= 128 * 1024 * 1024) 755 if (res <= 128 * 1024 * 1024)
1113 { 756 {
1300 943
1301/*****************************************************************************/ 944/*****************************************************************************/
1302/* requests implemented outside eio_execute, because they are so large */ 945/* requests implemented outside eio_execute, because they are so large */
1303 946
1304static void 947static void
1305eio__realpath (eio_req *req, etp_worker *self) 948eio__lseek (eio_req *req)
1306{ 949{
1307 char *rel = req->ptr1; 950 /* this usually gets optimised away completely, or your compiler sucks, */
951 /* or the whence constants really are not 0, 1, 2 */
952 int whence = req->int2 == EIO_SEEK_SET ? SEEK_SET
953 : req->int2 == EIO_SEEK_CUR ? SEEK_CUR
954 : req->int2 == EIO_SEEK_END ? SEEK_END
955 : req->int2;
956
957 req->offs = lseek (req->int1, req->offs, whence);
958 req->result = req->offs == (off_t)-1 ? -1 : 0;
959}
960
961/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
962static int
963eio__realpath (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
964{
1308 char *res; 965 char *res;
966 const char *rel = path;
1309 char *tmp1, *tmp2; 967 char *tmp1, *tmp2;
1310#if SYMLOOP_MAX > 32 968#if SYMLOOP_MAX > 32
1311 int symlinks = SYMLOOP_MAX; 969 int symlinks = SYMLOOP_MAX;
1312#else 970#else
1313 int symlinks = 32; 971 int symlinks = 32;
1314#endif 972#endif
1315 973
1316 req->result = -1;
1317
1318 errno = EINVAL; 974 errno = EINVAL;
1319 if (!rel) 975 if (!rel)
1320 return; 976 return -1;
1321 977
1322 errno = ENOENT; 978 errno = ENOENT;
1323 if (!*rel) 979 if (!*rel)
1324 return; 980 return -1;
1325 981
1326 if (!req->ptr2) 982 res = etp_tmpbuf_get (tmpbuf, PATH_MAX * 3);
1327 { 983#ifdef _WIN32
1328 X_LOCK (wrklock); 984 if (_access (rel, 4) != 0)
1329 req->flags |= EIO_FLAG_PTR2_FREE;
1330 X_UNLOCK (wrklock);
1331 req->ptr2 = malloc (PATH_MAX * 3);
1332
1333 errno = ENOMEM;
1334 if (!req->ptr2)
1335 return; 985 return -1;
1336 }
1337 986
1338 res = req->ptr2; 987 symlinks = GetFullPathName (rel, PATH_MAX * 3, res, 0);
988
989 errno = ENAMETOOLONG;
990 if (symlinks >= PATH_MAX * 3)
991 return -1;
992
993 errno = EIO;
994 if (symlinks <= 0)
995 return -1;
996
997 return symlinks;
998
999#else
1339 tmp1 = res + PATH_MAX; 1000 tmp1 = res + PATH_MAX;
1340 tmp2 = tmp1 + PATH_MAX; 1001 tmp2 = tmp1 + PATH_MAX;
1341 1002
1342#if 0 /* disabled, the musl way to do things is just too racy */ 1003#if 0 /* disabled, the musl way to do things is just too racy */
1343#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1004#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1347 1008
1348 if (fd >= 0) 1009 if (fd >= 0)
1349 { 1010 {
1350 sprintf (tmp1, "/proc/self/fd/%d", fd); 1011 sprintf (tmp1, "/proc/self/fd/%d", fd);
1351 req->result = readlink (tmp1, res, PATH_MAX); 1012 req->result = readlink (tmp1, res, PATH_MAX);
1013 /* here we should probably stat the open file and the disk file, to make sure they still match */
1352 close (fd); 1014 close (fd);
1353
1354 /* here we should probably stat the open file and the disk file, to make sure they still match */
1355 1015
1356 if (req->result > 0) 1016 if (req->result > 0)
1357 goto done; 1017 goto done;
1358 } 1018 }
1359 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO) 1019 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO)
1360 return; 1020 return -1;
1361 } 1021 }
1362#endif 1022#endif
1363#endif 1023#endif
1364 1024
1365 if (*rel != '/') 1025 if (*rel != '/')
1366 { 1026 {
1027 int len;
1028
1029 errno = ENOENT;
1030 if (wd == EIO_INVALID_WD)
1031 return -1;
1032
1033 if (wd == EIO_CWD)
1034 {
1367 if (!getcwd (res, PATH_MAX)) 1035 if (!getcwd (res, PATH_MAX))
1368 return; 1036 return -1;
1037
1038 len = strlen (res);
1039 }
1040 else
1041 memcpy (res, wd->str, len = wd->len);
1369 1042
1370 if (res [1]) /* only use if not / */ 1043 if (res [1]) /* only use if not / */
1371 res += strlen (res); 1044 res += len;
1372 } 1045 }
1373 1046
1374 while (*rel) 1047 while (*rel)
1375 { 1048 {
1376 eio_ssize_t len, linklen; 1049 eio_ssize_t len, linklen;
1377 char *beg = rel; 1050 const char *beg = rel;
1378 1051
1379 while (*rel && *rel != '/') 1052 while (*rel && *rel != '/')
1380 ++rel; 1053 ++rel;
1381 1054
1382 len = rel - beg; 1055 len = rel - beg;
1394 1067
1395 if (beg [1] == '.' && len == 2) 1068 if (beg [1] == '.' && len == 2)
1396 { 1069 {
1397 /* .. - back up one component, if possible */ 1070 /* .. - back up one component, if possible */
1398 1071
1399 while (res != req->ptr2) 1072 while (res != tmpbuf->ptr)
1400 if (*--res == '/') 1073 if (*--res == '/')
1401 break; 1074 break;
1402 1075
1403 continue; 1076 continue;
1404 } 1077 }
1405 } 1078 }
1406 1079
1407 errno = ENAMETOOLONG; 1080 errno = ENAMETOOLONG;
1408 if (res + 1 + len + 1 >= tmp1) 1081 if (res + 1 + len + 1 >= tmp1)
1409 return; 1082 return -1;
1410 1083
1411 /* copy one component */ 1084 /* copy one component */
1412 *res = '/'; 1085 *res = '/';
1413 memcpy (res + 1, beg, len); 1086 memcpy (res + 1, beg, len);
1414 1087
1415 /* zero-terminate, for readlink */ 1088 /* zero-terminate, for readlink */
1416 res [len + 1] = 0; 1089 res [len + 1] = 0;
1417 1090
1418 /* now check if it's a symlink */ 1091 /* now check if it's a symlink */
1419 linklen = readlink (req->ptr2, tmp1, PATH_MAX); 1092 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1420 1093
1421 if (linklen < 0) 1094 if (linklen < 0)
1422 { 1095 {
1423 if (errno != EINVAL) 1096 if (errno != EINVAL)
1424 return; 1097 return -1;
1425 1098
1426 /* it's a normal directory. hopefully */ 1099 /* it's a normal directory. hopefully */
1427 res += len + 1; 1100 res += len + 1;
1428 } 1101 }
1429 else 1102 else
1431 /* yay, it was a symlink - build new path in tmp2 */ 1104 /* yay, it was a symlink - build new path in tmp2 */
1432 int rellen = strlen (rel); 1105 int rellen = strlen (rel);
1433 1106
1434 errno = ENAMETOOLONG; 1107 errno = ENAMETOOLONG;
1435 if (linklen + 1 + rellen >= PATH_MAX) 1108 if (linklen + 1 + rellen >= PATH_MAX)
1436 return; 1109 return -1;
1437 1110
1438 errno = ELOOP; 1111 errno = ELOOP;
1439 if (!--symlinks) 1112 if (!--symlinks)
1440 return; 1113 return -1;
1441 1114
1442 if (*tmp1 == '/') 1115 if (*tmp1 == '/')
1443 res = req->ptr2; /* symlink resolves to an absolute path */ 1116 res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1444 1117
1445 /* we need to be careful, as rel might point into tmp2 already */ 1118 /* we need to be careful, as rel might point into tmp2 already */
1446 memmove (tmp2 + linklen + 1, rel, rellen + 1); 1119 memmove (tmp2 + linklen + 1, rel, rellen + 1);
1447 tmp2 [linklen] = '/'; 1120 tmp2 [linklen] = '/';
1448 memcpy (tmp2, tmp1, linklen); 1121 memcpy (tmp2, tmp1, linklen);
1450 rel = tmp2; 1123 rel = tmp2;
1451 } 1124 }
1452 } 1125 }
1453 1126
1454 /* special case for the lone root path */ 1127 /* special case for the lone root path */
1455 if (res == req->ptr2) 1128 if (res == tmpbuf->ptr)
1456 *res++ = '/'; 1129 *res++ = '/';
1457 1130
1458 req->result = res - (char *)req->ptr2; 1131 return res - (char *)tmpbuf->ptr;
1459 1132#endif
1460done:
1461 req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1462} 1133}
1463 1134
1464static signed char 1135static signed char
1465eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1136eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1466{ 1137{
1654#ifdef _WIN32 1325#ifdef _WIN32
1655 { 1326 {
1656 int len = strlen ((const char *)req->ptr1); 1327 int len = strlen ((const char *)req->ptr1);
1657 char *path = malloc (MAX_PATH); 1328 char *path = malloc (MAX_PATH);
1658 const char *fmt; 1329 const char *fmt;
1330 const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1659 1331
1660 if (!len) 1332 if (!len)
1661 fmt = "./*"; 1333 fmt = "./*";
1662 else if (((const char *)req->ptr1)[len - 1] == '/' || ((const char *)req->ptr1)[len - 1] == '\\') 1334 else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1663 fmt = "%s*"; 1335 fmt = "%s*";
1664 else 1336 else
1665 fmt = "%s/*"; 1337 fmt = "%s/*";
1666 1338
1667 _snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1); 1339 _snprintf (path, MAX_PATH, fmt, reqpath);
1668 dirp = FindFirstFile (path, &entp); 1340 dirp = FindFirstFile (path, &entp);
1669 free (path); 1341 free (path);
1670 1342
1671 if (dirp == INVALID_HANDLE_VALUE) 1343 if (dirp == INVALID_HANDLE_VALUE)
1672 { 1344 {
1673 dirp = 0; 1345 /* should steal _dosmaperr */
1674
1675 switch (GetLastError ()) 1346 switch (GetLastError ())
1676 { 1347 {
1677 case ERROR_FILE_NOT_FOUND: 1348 case ERROR_FILE_NOT_FOUND:
1678 req->result = 0; 1349 req->result = 0;
1679 break; 1350 break;
1680 1351
1681 case ERROR_INVALID_NAME: 1352 case ERROR_INVALID_NAME:
1682 case ERROR_PATH_NOT_FOUND: 1353 case ERROR_PATH_NOT_FOUND:
1683 case ERROR_NO_MORE_FILES: 1354 case ERROR_NO_MORE_FILES:
1684 errno = ENOENT; 1355 errno = ENOENT;
1685 break; 1356 break;
1686 1357
1687 case ERROR_NOT_ENOUGH_MEMORY: 1358 case ERROR_NOT_ENOUGH_MEMORY:
1688 errno = ENOMEM; 1359 errno = ENOMEM;
1689 break; 1360 break;
1690 1361
1691 default: 1362 default:
1692 errno = EINVAL; 1363 errno = EINVAL;
1693 break; 1364 break;
1694 } 1365 }
1366
1367 return;
1695 } 1368 }
1696 } 1369 }
1697#else 1370#else
1371 #if HAVE_AT
1372 if (req->wd)
1373 {
1374 int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1375
1376 if (fd < 0)
1377 return;
1378
1379 dirp = fdopendir (fd);
1380
1381 if (!dirp)
1382 close (fd);
1383 }
1384 else
1698 dirp = opendir (req->ptr1); 1385 dirp = opendir (req->ptr1);
1386 #else
1387 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
1388 #endif
1389
1390 if (!dirp)
1391 return;
1699#endif 1392#endif
1700 1393
1701 if (req->flags & EIO_FLAG_PTR1_FREE) 1394 if (req->flags & EIO_FLAG_PTR1_FREE)
1702 free (req->ptr1); 1395 free (req->ptr1);
1703 1396
1704 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1397 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1705 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1398 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1706 req->ptr2 = names = malloc (namesalloc); 1399 req->ptr2 = names = malloc (namesalloc);
1707 1400
1708 if (dirp && names && (!flags || dents)) 1401 if (!names || (flags && !dents))
1402 return;
1403
1709 for (;;) 1404 for (;;)
1710 { 1405 {
1711 int done; 1406 int done;
1712 1407
1713#ifdef _WIN32 1408#ifdef _WIN32
1714 done = !dirp; 1409 done = !dirp;
1715#else 1410#else
1716 errno = 0; 1411 errno = 0;
1717 entp = readdir (dirp); 1412 entp = readdir (dirp);
1718 done = !entp; 1413 done = !entp;
1719#endif 1414#endif
1720 1415
1721 if (done) 1416 if (done)
1722 { 1417 {
1723#ifndef _WIN32 1418#ifndef _WIN32
1724 int old_errno = errno; 1419 int old_errno = errno;
1725 closedir (dirp); 1420 closedir (dirp);
1726 errno = old_errno; 1421 errno = old_errno;
1727 1422
1728 if (errno) 1423 if (errno)
1729 break; 1424 break;
1730#endif 1425#endif
1731 1426
1732 /* sort etc. */ 1427 /* sort etc. */
1733 req->int1 = flags; 1428 req->int1 = flags;
1734 req->result = dentoffs; 1429 req->result = dentoffs;
1735 1430
1736 if (flags & EIO_READDIR_STAT_ORDER) 1431 if (flags & EIO_READDIR_STAT_ORDER)
1737 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits); 1432 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1738 else if (flags & EIO_READDIR_DIRS_FIRST) 1433 else if (flags & EIO_READDIR_DIRS_FIRST)
1739 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1434 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1740 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */ 1435 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1741 else 1436 else
1437 {
1438 /* in this case, all is known, and we just put dirs first and sort them */
1439 eio_dirent *oth = dents + dentoffs;
1440 eio_dirent *dir = dents;
1441
1442 /* now partition dirs to the front, and non-dirs to the back */
1443 /* by walking from both sides and swapping if necessary */
1444 while (oth > dir)
1445 {
1446 if (dir->type == EIO_DT_DIR)
1447 ++dir;
1448 else if ((--oth)->type == EIO_DT_DIR)
1449 {
1450 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1451
1452 ++dir;
1453 }
1454 }
1455
1456 /* now sort the dirs only (dirs all have the same score) */
1457 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1458 }
1459
1460 break;
1461 }
1462
1463 /* now add the entry to our list(s) */
1464 name = D_NAME (entp);
1465
1466 /* skip . and .. entries */
1467 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1468 {
1469 int len = D_NAMLEN (entp) + 1;
1470
1471 while (ecb_expect_false (namesoffs + len > namesalloc))
1472 {
1473 namesalloc *= 2;
1474 req->ptr2 = names = realloc (names, namesalloc);
1475
1476 if (!names)
1477 break;
1478 }
1479
1480 memcpy (names + namesoffs, name, len);
1481
1482 if (dents)
1483 {
1484 struct eio_dirent *ent;
1485
1486 if (ecb_expect_false (dentoffs == dentalloc))
1742 { 1487 {
1743 /* in this case, all is known, and we just put dirs first and sort them */ 1488 dentalloc *= 2;
1489 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1490
1491 if (!dents)
1492 break;
1493 }
1494
1744 eio_dirent *oth = dents + dentoffs; 1495 ent = dents + dentoffs;
1745 eio_dirent *dir = dents;
1746 1496
1747 /* now partition dirs to the front, and non-dirs to the back */ 1497 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1748 /* by walking from both sides and swapping if necessary */ 1498 ent->namelen = len - 1;
1749 while (oth > dir) 1499 ent->inode = D_INO (entp);
1500
1501 inode_bits |= ent->inode;
1502
1503 switch (D_TYPE (entp))
1504 {
1505 default:
1506 ent->type = EIO_DT_UNKNOWN;
1507 flags |= EIO_READDIR_FOUND_UNKNOWN;
1508 break;
1509
1510 #ifdef DT_FIFO
1511 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1512 #endif
1513 #ifdef DT_CHR
1514 case DT_CHR: ent->type = EIO_DT_CHR; break;
1515 #endif
1516 #ifdef DT_MPC
1517 case DT_MPC: ent->type = EIO_DT_MPC; break;
1518 #endif
1519 #ifdef DT_DIR
1520 case DT_DIR: ent->type = EIO_DT_DIR; break;
1521 #endif
1522 #ifdef DT_NAM
1523 case DT_NAM: ent->type = EIO_DT_NAM; break;
1524 #endif
1525 #ifdef DT_BLK
1526 case DT_BLK: ent->type = EIO_DT_BLK; break;
1527 #endif
1528 #ifdef DT_MPB
1529 case DT_MPB: ent->type = EIO_DT_MPB; break;
1530 #endif
1531 #ifdef DT_REG
1532 case DT_REG: ent->type = EIO_DT_REG; break;
1533 #endif
1534 #ifdef DT_NWK
1535 case DT_NWK: ent->type = EIO_DT_NWK; break;
1536 #endif
1537 #ifdef DT_CMP
1538 case DT_CMP: ent->type = EIO_DT_CMP; break;
1539 #endif
1540 #ifdef DT_LNK
1541 case DT_LNK: ent->type = EIO_DT_LNK; break;
1542 #endif
1543 #ifdef DT_SOCK
1544 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1545 #endif
1546 #ifdef DT_DOOR
1547 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1548 #endif
1549 #ifdef DT_WHT
1550 case DT_WHT: ent->type = EIO_DT_WHT; break;
1551 #endif
1552 }
1553
1554 ent->score = 7;
1555
1556 if (flags & EIO_READDIR_DIRS_FIRST)
1557 {
1558 if (ent->type == EIO_DT_UNKNOWN)
1750 { 1559 {
1751 if (dir->type == EIO_DT_DIR) 1560 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1752 ++dir; 1561 ent->score = 1;
1753 else if ((--oth)->type == EIO_DT_DIR) 1562 else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1754 { 1563 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1755 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1756
1757 ++dir;
1758 }
1759 } 1564 }
1760 1565 else if (ent->type == EIO_DT_DIR)
1761 /* now sort the dirs only (dirs all have the same score) */ 1566 ent->score = 0;
1762 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1763 } 1567 }
1764
1765 break;
1766 }
1767
1768 /* now add the entry to our list(s) */
1769 name = D_NAME (entp);
1770
1771 /* skip . and .. entries */
1772 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1773 {
1774 int len = D_NAMLEN (entp) + 1;
1775
1776 while (ecb_expect_false (namesoffs + len > namesalloc))
1777 {
1778 namesalloc *= 2;
1779 req->ptr2 = names = realloc (names, namesalloc);
1780
1781 if (!names)
1782 break;
1783 } 1568 }
1784 1569
1785 memcpy (names + namesoffs, name, len);
1786
1787 if (dents)
1788 {
1789 struct eio_dirent *ent;
1790
1791 if (ecb_expect_false (dentoffs == dentalloc))
1792 {
1793 dentalloc *= 2;
1794 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1795
1796 if (!dents)
1797 break;
1798 }
1799
1800 ent = dents + dentoffs;
1801
1802 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1803 ent->namelen = len - 1;
1804 ent->inode = D_INO (entp);
1805
1806 inode_bits |= ent->inode;
1807
1808 switch (D_TYPE (entp))
1809 {
1810 default:
1811 ent->type = EIO_DT_UNKNOWN;
1812 flags |= EIO_READDIR_FOUND_UNKNOWN;
1813 break;
1814
1815 #ifdef DT_FIFO
1816 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1817 #endif
1818 #ifdef DT_CHR
1819 case DT_CHR: ent->type = EIO_DT_CHR; break;
1820 #endif
1821 #ifdef DT_MPC
1822 case DT_MPC: ent->type = EIO_DT_MPC; break;
1823 #endif
1824 #ifdef DT_DIR
1825 case DT_DIR: ent->type = EIO_DT_DIR; break;
1826 #endif
1827 #ifdef DT_NAM
1828 case DT_NAM: ent->type = EIO_DT_NAM; break;
1829 #endif
1830 #ifdef DT_BLK
1831 case DT_BLK: ent->type = EIO_DT_BLK; break;
1832 #endif
1833 #ifdef DT_MPB
1834 case DT_MPB: ent->type = EIO_DT_MPB; break;
1835 #endif
1836 #ifdef DT_REG
1837 case DT_REG: ent->type = EIO_DT_REG; break;
1838 #endif
1839 #ifdef DT_NWK
1840 case DT_NWK: ent->type = EIO_DT_NWK; break;
1841 #endif
1842 #ifdef DT_CMP
1843 case DT_CMP: ent->type = EIO_DT_CMP; break;
1844 #endif
1845 #ifdef DT_LNK
1846 case DT_LNK: ent->type = EIO_DT_LNK; break;
1847 #endif
1848 #ifdef DT_SOCK
1849 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1850 #endif
1851 #ifdef DT_DOOR
1852 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1853 #endif
1854 #ifdef DT_WHT
1855 case DT_WHT: ent->type = EIO_DT_WHT; break;
1856 #endif
1857 }
1858
1859 ent->score = 7;
1860
1861 if (flags & EIO_READDIR_DIRS_FIRST)
1862 {
1863 if (ent->type == EIO_DT_UNKNOWN)
1864 {
1865 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1866 ent->score = 1;
1867 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1868 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1869 }
1870 else if (ent->type == EIO_DT_DIR)
1871 ent->score = 0;
1872 }
1873 }
1874
1875 namesoffs += len; 1570 namesoffs += len;
1876 ++dentoffs; 1571 ++dentoffs;
1877 } 1572 }
1878 1573
1879 if (EIO_CANCELLED (req)) 1574 if (EIO_CANCELLED (req))
1880 { 1575 {
1881 errno = ECANCELED; 1576 errno = ECANCELED;
1882 break; 1577 break;
1883 } 1578 }
1884 1579
1885#ifdef _WIN32 1580#ifdef _WIN32
1886 if (!FindNextFile (dirp, &entp)) 1581 if (!FindNextFile (dirp, &entp))
1887 { 1582 {
1888 FindClose (dirp); 1583 FindClose (dirp);
1889 dirp = 0; 1584 dirp = 0;
1890 } 1585 }
1891#endif 1586#endif
1892 } 1587 }
1893} 1588}
1589
1590/*****************************************************************************/
1591/* working directory stuff */
1592/* various deficiencies in the posix 2008 api force us to */
1593/* keep the absolute path in string form at all times */
1594/* fuck yeah. */
1595
1596#if !HAVE_AT
1597
1598/* a bit like realpath, but usually faster because it doesn'T have to return */
1599/* an absolute or canonical path */
1600static const char *
1601wd_expand (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
1602{
1603 if (!wd || *path == '/')
1604 return path;
1605
1606 if (path [0] == '.' && !path [1])
1607 return wd->str;
1608
1609 {
1610 int l1 = wd->len;
1611 int l2 = strlen (path);
1612
1613 char *res = etp_tmpbuf_get (tmpbuf, l1 + l2 + 2);
1614
1615 memcpy (res, wd->str, l1);
1616 res [l1] = '/';
1617 memcpy (res + l1 + 1, path, l2 + 1);
1618
1619 return res;
1620 }
1621}
1622
1623#endif
1624
1625static eio_wd
1626eio__wd_open_sync (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
1627{
1628 int fd;
1629 eio_wd res;
1630 int len = eio__realpath (tmpbuf, wd, path);
1631
1632 if (len < 0)
1633 return EIO_INVALID_WD;
1634
1635#if HAVE_AT
1636 fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1637
1638 if (fd < 0)
1639 return EIO_INVALID_WD;
1640#endif
1641
1642 res = malloc (sizeof (*res) + len); /* one extra 0-byte */
1643
1644#if HAVE_AT
1645 res->fd = fd;
1646#endif
1647
1648 res->len = len;
1649 memcpy (res->str, tmpbuf->ptr, len);
1650 res->str [len] = 0;
1651
1652 return res;
1653}
1654
1655eio_wd
1656eio_wd_open_sync (eio_wd wd, const char *path)
1657{
1658 struct etp_tmpbuf tmpbuf = { };
1659 wd = eio__wd_open_sync (&tmpbuf, wd, path);
1660 free (tmpbuf.ptr);
1661
1662 return wd;
1663}
1664
1665void
1666eio_wd_close_sync (eio_wd wd)
1667{
1668 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
1669 {
1670 #if HAVE_AT
1671 close (wd->fd);
1672 #endif
1673 free (wd);
1674 }
1675}
1676
1677#if HAVE_AT
1678
1679/* they forgot these */
1680
1681static int
1682eio__truncateat (int dirfd, const char *path, off_t length)
1683{
1684 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
1685 int res;
1686
1687 if (fd < 0)
1688 return fd;
1689
1690 res = ftruncate (fd, length);
1691 close (fd);
1692 return res;
1693}
1694
1695static int
1696eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
1697{
1698 int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC);
1699 int res;
1700
1701 if (fd < 0)
1702 return fd;
1703
1704 res = fstatvfs (fd, buf);
1705 close (fd);
1706 return res;
1707
1708}
1709
1710#endif
1894 1711
1895/*****************************************************************************/ 1712/*****************************************************************************/
1896 1713
1897#define ALLOC(len) \ 1714#define ALLOC(len) \
1898 if (!req->ptr2) \ 1715 if (!req->ptr2) \
1899 { \ 1716 { \
1900 X_LOCK (wrklock); \ 1717 X_LOCK (EIO_POOL->wrklock); \
1901 req->flags |= EIO_FLAG_PTR2_FREE; \ 1718 req->flags |= EIO_FLAG_PTR2_FREE; \
1902 X_UNLOCK (wrklock); \ 1719 X_UNLOCK (EIO_POOL->wrklock); \
1903 req->ptr2 = malloc (len); \ 1720 req->ptr2 = malloc (len); \
1904 if (!req->ptr2) \ 1721 if (!req->ptr2) \
1905 { \ 1722 { \
1906 errno = ENOMEM; \ 1723 errno = ENOMEM; \
1907 req->result = -1; \ 1724 req->result = -1; \
1908 break; \ 1725 break; \
1909 } \ 1726 } \
1910 } 1727 }
1911 1728
1912X_THREAD_PROC (etp_proc)
1913{
1914 ETP_REQ *req;
1915 struct timespec ts;
1916 etp_worker *self = (etp_worker *)thr_arg;
1917
1918 /* try to distribute timeouts somewhat evenly */
1919 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1920
1921 for (;;)
1922 {
1923 ts.tv_sec = 0;
1924
1925 X_LOCK (reqlock);
1926
1927 for (;;)
1928 {
1929 self->req = req = reqq_shift (&req_queue);
1930
1931 if (req)
1932 break;
1933
1934 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
1935 {
1936 X_UNLOCK (reqlock);
1937 X_LOCK (wrklock);
1938 --started;
1939 X_UNLOCK (wrklock);
1940 goto quit;
1941 }
1942
1943 ++idle;
1944
1945 if (idle <= max_idle)
1946 /* we are allowed to idle, so do so without any timeout */
1947 X_COND_WAIT (reqwait, reqlock);
1948 else
1949 {
1950 /* initialise timeout once */
1951 if (!ts.tv_sec)
1952 ts.tv_sec = time (0) + idle_timeout;
1953
1954 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1955 ts.tv_sec = 1; /* assuming this is not a value computed above.,.. */
1956 }
1957
1958 --idle;
1959 }
1960
1961 --nready;
1962
1963 X_UNLOCK (reqlock);
1964
1965 if (req->type < 0)
1966 goto quit;
1967
1968 ETP_EXECUTE (self, req);
1969
1970 X_LOCK (reslock);
1971
1972 ++npending;
1973
1974 if (!reqq_push (&res_queue, req) && want_poll_cb)
1975 want_poll_cb ();
1976
1977 self->req = 0;
1978 etp_worker_clear (self);
1979
1980 X_UNLOCK (reslock);
1981 }
1982
1983quit:
1984 X_LOCK (wrklock);
1985 etp_worker_free (self);
1986 X_UNLOCK (wrklock);
1987
1988 return 0;
1989}
1990
1991/*****************************************************************************/ 1729/*****************************************************************************/
1992 1730
1993int ecb_cold 1731int ecb_cold
1994eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1732eio_init (void (*want_poll)(void), void (*done_poll)(void))
1995{ 1733{
1996#if !HAVE_PREADWRITE 1734 eio_want_poll_cb = want_poll;
1997 X_MUTEX_CREATE (preadwritelock); 1735 eio_done_poll_cb = done_poll;
1998#endif
1999 1736
2000 return etp_init (want_poll, done_poll); 1737 return etp_init (EIO_POOL, 0, 0, 0);
2001} 1738}
2002 1739
2003ecb_inline void 1740ecb_inline void
2004eio_api_destroy (eio_req *req) 1741eio_api_destroy (eio_req *req)
2005{ 1742{
2006 free (req); 1743 free (req);
2007} 1744}
2008 1745
2009#define REQ(rtype) \ 1746#define REQ(rtype) \
2010 eio_req *req; \ 1747 eio_req *req; \
2011 \ 1748 \
2012 req = (eio_req *)calloc (1, sizeof *req); \ 1749 req = (eio_req *)calloc (1, sizeof *req); \
2013 if (!req) \ 1750 if (!req) \
2014 return 0; \ 1751 return 0; \
2028 { \ 1765 { \
2029 eio_api_destroy (req); \ 1766 eio_api_destroy (req); \
2030 return 0; \ 1767 return 0; \
2031 } 1768 }
2032 1769
1770#define SINGLEDOT(ptr) (0[(char *)(ptr)] == '.' && !1[(char *)(ptr)])
1771
2033static void 1772static void
2034eio_execute (etp_worker *self, eio_req *req) 1773eio_execute (etp_worker *self, eio_req *req)
2035{ 1774{
1775#if HAVE_AT
1776 int dirfd;
1777#else
1778 const char *path;
1779#endif
1780
2036 if (ecb_expect_false (EIO_CANCELLED (req))) 1781 if (ecb_expect_false (EIO_CANCELLED (req)))
2037 { 1782 {
2038 req->result = -1; 1783 req->result = -1;
2039 req->errorno = ECANCELED; 1784 req->errorno = ECANCELED;
2040 return; 1785 return;
2041 } 1786 }
2042 1787
1788 if (ecb_expect_false (req->wd == EIO_INVALID_WD))
1789 {
1790 req->result = -1;
1791 req->errorno = ENOENT;
1792 return;
1793 }
1794
1795 if (req->type >= EIO_OPEN)
1796 {
1797 #if HAVE_AT
1798 dirfd = WD2FD (req->wd);
1799 #else
1800 path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1801 #endif
1802 }
1803
2043 switch (req->type) 1804 switch (req->type)
2044 { 1805 {
1806 case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
1807 req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
1808 break;
1809 case EIO_WD_CLOSE: req->result = 0;
1810 eio_wd_close_sync (req->wd); break;
1811
1812 case EIO_SEEK: eio__lseek (req); break;
2045 case EIO_READ: ALLOC (req->size); 1813 case EIO_READ: ALLOC (req->size);
2046 req->result = req->offs >= 0 1814 req->result = req->offs >= 0
2047 ? pread (req->int1, req->ptr2, req->size, req->offs) 1815 ? pread (req->int1, req->ptr2, req->size, req->offs)
2048 : read (req->int1, req->ptr2, req->size); break; 1816 : read (req->int1, req->ptr2, req->size); break;
2049 case EIO_WRITE: req->result = req->offs >= 0 1817 case EIO_WRITE: req->result = req->offs >= 0
2051 : write (req->int1, req->ptr2, req->size); break; 1819 : write (req->int1, req->ptr2, req->size); break;
2052 1820
2053 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 1821 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
2054 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break; 1822 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
2055 1823
1824#if HAVE_AT
1825
2056 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1826 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2057 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 1827 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
2058 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1828 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1829 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
1830 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
1831 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
1832 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
1833 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
1834
1835 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
1836 case EIO_RMDIR: /* complications arise because "." cannot be removed, so we might have to expand */
1837 req->result = req->wd && SINGLEDOT (req->ptr1)
1838 ? rmdir (req->wd->str)
1839 : unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
1840 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
1841 case EIO_RENAME: /* complications arise because "." cannot be renamed, so we might have to expand */
1842 req->result = req->wd && SINGLEDOT (req->ptr1)
1843 ? rename (req->wd->str, req->ptr2)
1844 : renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
1845 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
1846 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
1847 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1848 case EIO_READLINK: ALLOC (PATH_MAX);
1849 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
1850 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1851 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1852 case EIO_UTIME:
1853 case EIO_FUTIME:
1854 {
1855 struct timespec ts[2];
1856 struct timespec *times;
1857
1858 if (req->nv1 != -1. || req->nv2 != -1.)
1859 {
1860 ts[0].tv_sec = req->nv1;
1861 ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
1862 ts[1].tv_sec = req->nv2;
1863 ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
1864
1865 times = ts;
1866 }
1867 else
1868 times = 0;
1869
1870 req->result = req->type == EIO_FUTIME
1871 ? futimens (req->int1, times)
1872 : utimensat (dirfd, req->ptr1, times, 0);
1873 }
1874 break;
1875
1876#else
1877
1878 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1879 req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
1880 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2059 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 1881 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
1882 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
1883 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
1884 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
1885 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
1886
1887 case EIO_UNLINK: req->result = unlink (path ); break;
1888 case EIO_RMDIR: req->result = rmdir (path ); break;
1889 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
1890 case EIO_RENAME: req->result = rename (path , req->ptr2); break;
1891 case EIO_LINK: req->result = link (path , req->ptr2); break;
1892 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
1893 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
1894 case EIO_READLINK: ALLOC (PATH_MAX);
1895 req->result = readlink (path, req->ptr2, PATH_MAX); break;
1896 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1897 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
1898
1899 case EIO_UTIME:
1900 case EIO_FUTIME:
1901 {
1902 struct timeval tv[2];
1903 struct timeval *times;
1904
1905 if (req->nv1 != -1. || req->nv2 != -1.)
1906 {
1907 tv[0].tv_sec = req->nv1;
1908 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
1909 tv[1].tv_sec = req->nv2;
1910 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
1911
1912 times = tv;
1913 }
1914 else
1915 times = 0;
1916
1917 req->result = req->type == EIO_FUTIME
1918 ? futimes (req->int1, times)
1919 : utimes (req->ptr1, times);
1920 }
1921 break;
1922
1923#endif
1924
1925 case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
1926 {
1927 ALLOC (req->result);
1928 memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
1929 }
1930 break;
1931
2060 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1932 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2061 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 1933 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
2062 1934
2063 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2064 req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2065 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 1935 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2066 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 1936 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2067 1937
2068 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
2069 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break; 1938 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
2070 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
2071 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break; 1939 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
2072 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
2073 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break; 1940 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2074 1941
2075 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
2076 case EIO_CLOSE: req->result = close (req->int1); break; 1942 case EIO_CLOSE: req->result = close (req->int1); break;
2077 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 1943 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
2078 case EIO_UNLINK: req->result = unlink (req->ptr1); break;
2079 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
2080 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
2081 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
2082 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
2083 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
2084 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2085
2086 case EIO_REALPATH: eio__realpath (req, self); break;
2087
2088 case EIO_READLINK: ALLOC (PATH_MAX);
2089 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
2090
2091 case EIO_SYNC: req->result = 0; sync (); break; 1944 case EIO_SYNC: req->result = 0; sync (); break;
2092 case EIO_FSYNC: req->result = fsync (req->int1); break; 1945 case EIO_FSYNC: req->result = fsync (req->int1); break;
2093 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 1946 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2094 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break; 1947 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
2095 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break; 1948 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2114 req->result = select (0, 0, 0, 0, &tv); 1967 req->result = select (0, 0, 0, 0, &tv);
2115 } 1968 }
2116#endif 1969#endif
2117 break; 1970 break;
2118 1971
2119 case EIO_UTIME: 1972#if 0
2120 case EIO_FUTIME:
2121 {
2122 struct timeval tv[2];
2123 struct timeval *times;
2124
2125 if (req->nv1 != -1. || req->nv2 != -1.)
2126 {
2127 tv[0].tv_sec = req->nv1;
2128 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
2129 tv[1].tv_sec = req->nv2;
2130 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
2131
2132 times = tv;
2133 }
2134 else
2135 times = 0;
2136
2137 req->result = req->type == EIO_FUTIME
2138 ? futimes (req->int1, times)
2139 : utimes (req->ptr1, times);
2140 }
2141 break;
2142
2143 case EIO_GROUP: 1973 case EIO_GROUP:
2144 abort (); /* handled in eio_request */ 1974 abort (); /* handled in eio_request */
1975#endif
2145 1976
2146 case EIO_NOP: 1977 case EIO_NOP:
2147 req->result = 0; 1978 req->result = 0;
2148 break; 1979 break;
2149 1980
2150 case EIO_CUSTOM: 1981 case EIO_CUSTOM:
2151 req->feed (req); 1982 req->feed (req);
2152 break; 1983 break;
2153 1984
2154 default: 1985 default:
2155 errno = ENOSYS;
2156 req->result = -1; 1986 req->result = EIO_ENOSYS ();
2157 break; 1987 break;
2158 } 1988 }
2159 1989
2160 req->errorno = errno; 1990 req->errorno = errno;
2161} 1991}
2162 1992
2163#ifndef EIO_NO_WRAPPERS 1993#ifndef EIO_NO_WRAPPERS
2164 1994
1995eio_req *eio_wd_open (const char *path, int pri, eio_cb cb, void *data)
1996{
1997 REQ (EIO_WD_OPEN); PATH; SEND;
1998}
1999
2000eio_req *eio_wd_close (eio_wd wd, int pri, eio_cb cb, void *data)
2001{
2002 REQ (EIO_WD_CLOSE); req->wd = wd; SEND;
2003}
2004
2165eio_req *eio_nop (int pri, eio_cb cb, void *data) 2005eio_req *eio_nop (int pri, eio_cb cb, void *data)
2166{ 2006{
2167 REQ (EIO_NOP); SEND; 2007 REQ (EIO_NOP); SEND;
2168} 2008}
2169 2009
2228} 2068}
2229 2069
2230eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data) 2070eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data)
2231{ 2071{
2232 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND; 2072 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND;
2073}
2074
2075eio_req *eio_seek (int fd, off_t offset, int whence, int pri, eio_cb cb, void *data)
2076{
2077 REQ (EIO_SEEK); req->int1 = fd; req->offs = offset; req->int2 = whence; SEND;
2233} 2078}
2234 2079
2235eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data) 2080eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2236{ 2081{
2237 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND; 2082 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
2435void 2280void
2436eio_grp_add (eio_req *grp, eio_req *req) 2281eio_grp_add (eio_req *grp, eio_req *req)
2437{ 2282{
2438 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2)); 2283 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
2439 2284
2440 grp->flags |= EIO_FLAG_GROUPADD; 2285 grp->flags |= ETP_FLAG_GROUPADD;
2441 2286
2442 ++grp->size; 2287 ++grp->size;
2443 req->grp = grp; 2288 req->grp = grp;
2444 2289
2445 req->grp_prev = 0; 2290 req->grp_prev = 0;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines