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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines