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.141 by root, Tue Feb 23 19:47:44 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,
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
127 #define fcntl(fd,cmd,arg) EIO_ENOSYS ()
128 #define ioctl(fd,cmd,arg) EIO_ENOSYS ()
123 #define fchmod(fd,mode) EIO_ENOSYS () 129 #define fchmod(fd,mode) EIO_ENOSYS ()
124 #define chown(path,uid,gid) EIO_ENOSYS () 130 #define chown(path,uid,gid) EIO_ENOSYS ()
125 #define fchown(fd,uid,gid) EIO_ENOSYS () 131 #define fchown(fd,uid,gid) EIO_ENOSYS ()
126 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */ 132 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
127 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */ 133 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
128 #define mknod(path,mode,dev) EIO_ENOSYS () 134 #define mknod(path,mode,dev) EIO_ENOSYS ()
129 #define sync() EIO_ENOSYS () 135 #define sync() EIO_ENOSYS ()
130 #define readlink(path,buf,s) EIO_ENOSYS () 136 #define readlink(path,buf,s) EIO_ENOSYS ()
131 #define statvfs(path,buf) EIO_ENOSYS () 137 #define statvfs(path,buf) EIO_ENOSYS ()
132 #define fstatvfs(fd,buf) EIO_ENOSYS () 138 #define fstatvfs(fd,buf) EIO_ENOSYS ()
139
140 #define pread(fd,buf,count,offset) eio__pread (fd, buf, count, offset)
141 #define pwrite(fd,buf,count,offset) eio__pwrite (fd, buf, count, offset)
142
143 #if __GNUC__
144 typedef long long eio_off_t; /* signed for compatibility to msvc */
145 #else
146 typedef __int64 eio_off_t; /* unsigned not supported by msvc */
147 #endif
148
149 static eio_ssize_t
150 eio__pread (int fd, void *buf, eio_ssize_t count, eio_off_t offset)
151 {
152 OVERLAPPED o = { 0 };
153 DWORD got;
154
155 o.Offset = offset;
156 o.OffsetHigh = offset >> 32;
157
158 return ReadFile ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd), buf, count, &got, &o)
159 ? got : -1;
160 }
161
162 static eio_ssize_t
163 eio__pwrite (int fd, void *buf, eio_ssize_t count, eio_off_t offset)
164 {
165 OVERLAPPED o = { 0 };
166 DWORD got;
167
168 o.Offset = offset;
169 o.OffsetHigh = offset >> 32;
170
171 return WriteFile ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd), buf, count, &got, &o)
172 ? got : -1;
173 }
133 174
134 /* rename() uses MoveFile, which fails to overwrite */ 175 /* rename() uses MoveFile, which fails to overwrite */
135 #define rename(old,neu) eio__rename (old, neu) 176 #define rename(old,neu) eio__rename (old, neu)
136 177
137 static int 178 static int
175 #endif 216 #endif
176 217
177 return EIO_ERRNO (ENOENT, -1); 218 return EIO_ERRNO (ENOENT, -1);
178 } 219 }
179 220
180 /* POSIX API only */ 221 /* POSIX API only, causing trouble for win32 apps */
181 #define CreateHardLink(neu,old,flags) 0 222 #define CreateHardLink(neu,old,flags) 0 /* not really creating hardlink, still using relative paths? */
182 #define CreateSymbolicLink(neu,old,flags) 0 223 #define CreateSymbolicLink(neu,old,flags) 0 /* vista+ only */
183 224
184 struct statvfs 225 struct statvfs
185 { 226 {
186 int dummy; 227 int dummy;
187 }; 228 };
193 234
194#else 235#else
195 236
196 #include <sys/time.h> 237 #include <sys/time.h>
197 #include <sys/select.h> 238 #include <sys/select.h>
198 #include <sys/statvfs.h>
199 #include <unistd.h> 239 #include <unistd.h>
200 #include <signal.h> 240 #include <signal.h>
201 #include <dirent.h> 241 #include <dirent.h>
202 242
243 #ifdef ANDROID
244 #include <sys/vfs.h>
245 #define statvfs statfs
246 #define fstatvfs fstatfs
247 #include <asm/page.h> /* supposedly limits.h does #define PAGESIZE PAGESIZE */
248 #else
249 #include <sys/statvfs.h>
250 #endif
251
203 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES 252 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
204 #include <sys/mman.h> 253 #include <sys/mman.h>
205 #endif 254 #endif
206 255
207 #define D_NAME(entp) entp->d_name 256 #define D_NAME(entp) entp->d_name
208 257
209 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */ 258 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
210 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 259 #if __FreeBSD__ || __NetBSD__ || __OpenBSD__
211 #define _DIRENT_HAVE_D_TYPE /* sigh */ 260 #define _DIRENT_HAVE_D_TYPE /* sigh */
212 #define D_INO(de) (de)->d_fileno 261 #define D_INO(de) (de)->d_fileno
213 #define D_NAMLEN(de) (de)->d_namlen 262 #define D_NAMLEN(de) (de)->d_namlen
214 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600 263 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
215 #define D_INO(de) (de)->d_ino 264 #define D_INO(de) (de)->d_ino
278#endif 327#endif
279 328
280/* buffer size for various temporary buffers */ 329/* buffer size for various temporary buffers */
281#define EIO_BUFSIZE 65536 330#define EIO_BUFSIZE 65536
282 331
283#define dBUF \ 332#define dBUF \
284 char *eio_buf = malloc (EIO_BUFSIZE); \ 333 char *eio_buf = malloc (EIO_BUFSIZE); \
285 errno = ENOMEM; \ 334 errno = ENOMEM; \
286 if (!eio_buf) \ 335 if (!eio_buf) \
287 return -1 336 return -1
288 337
289#define FUBd \ 338#define FUBd \
290 free (eio_buf) 339 free (eio_buf)
291 340
292#define EIO_TICKS ((1000000 + 1023) >> 10) 341/*****************************************************************************/
342
343struct etp_tmpbuf;
344
345#if _POSIX_VERSION >= 200809L
346 #define HAVE_AT 1
347 #define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD)
348 #ifndef O_SEARCH
349 #define O_SEARCH O_RDONLY
350 #endif
351#else
352 #define HAVE_AT 0
353 static const char *wd_expand (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path);
354#endif
355
356struct eio_pwd
357{
358#if HAVE_AT
359 int fd;
360#endif
361 int len;
362 char str[1]; /* actually, a 0-terminated canonical path */
363};
364
365/*****************************************************************************/
293 366
294#define ETP_PRI_MIN EIO_PRI_MIN 367#define ETP_PRI_MIN EIO_PRI_MIN
295#define ETP_PRI_MAX EIO_PRI_MAX 368#define ETP_PRI_MAX EIO_PRI_MAX
296 369
370#define ETP_TYPE_QUIT -1
371#define ETP_TYPE_GROUP EIO_GROUP
372
373static void eio_nop_callback (void) { }
374static void (*eio_want_poll_cb)(void) = eio_nop_callback;
375static void (*eio_done_poll_cb)(void) = eio_nop_callback;
376
377#define ETP_WANT_POLL(pool) eio_want_poll_cb ()
378#define ETP_DONE_POLL(pool) eio_done_poll_cb ()
379
297struct etp_worker; 380struct etp_worker;
298
299#define ETP_REQ eio_req 381#define ETP_REQ eio_req
300#define ETP_DESTROY(req) eio_destroy (req) 382#define ETP_DESTROY(req) eio_destroy (req)
301static int eio_finish (eio_req *req); 383static int eio_finish (eio_req *req);
302#define ETP_FINISH(req) eio_finish (req) 384#define ETP_FINISH(req) eio_finish (req)
303static void eio_execute (struct etp_worker *self, eio_req *req); 385static void eio_execute (struct etp_worker *self, eio_req *req);
304#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 386#define ETP_EXECUTE(wrk,req) eio_execute (wrk, req)
305 387
306/*****************************************************************************/ 388#include "etp.c"
307 389
308#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 390static struct etp_pool eio_pool;
309 391#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 392
741/*****************************************************************************/ 393/*****************************************************************************/
742 394
743static void 395static void
744grp_try_feed (eio_req *grp) 396grp_try_feed (eio_req *grp)
745{ 397{
746 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 398 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
747 { 399 {
748 grp->flags &= ~EIO_FLAG_GROUPADD; 400 grp->flags &= ~ETP_FLAG_GROUPADD;
749 401
750 EIO_FEED (grp); 402 EIO_FEED (grp);
751 403
752 /* stop if no progress has been made */ 404 /* stop if no progress has been made */
753 if (!(grp->flags & EIO_FLAG_GROUPADD)) 405 if (!(grp->flags & ETP_FLAG_GROUPADD))
754 { 406 {
755 grp->feed = 0; 407 grp->feed = 0;
756 break; 408 break;
757 } 409 }
758 } 410 }
765 417
766 /* call feeder, if applicable */ 418 /* call feeder, if applicable */
767 grp_try_feed (grp); 419 grp_try_feed (grp);
768 420
769 /* finish, if done */ 421 /* finish, if done */
770 if (!grp->size && grp->int1) 422 if (!grp->size && grp->flags & ETP_FLAG_DELAYED)
771 return eio_finish (grp); 423 return eio_finish (grp);
772 else 424 else
773 return 0; 425 return 0;
774} 426}
775 427
811} 463}
812 464
813void 465void
814eio_grp_cancel (eio_req *grp) 466eio_grp_cancel (eio_req *grp)
815{ 467{
816 for (grp = grp->grp_first; grp; grp = grp->grp_next) 468 etp_grp_cancel (EIO_POOL, grp);
817 eio_cancel (grp);
818} 469}
819 470
820void 471void
821eio_cancel (eio_req *req) 472eio_cancel (eio_req *req)
822{ 473{
823 etp_cancel (req); 474 etp_cancel (EIO_POOL, req);
824} 475}
825 476
826void 477void
827eio_submit (eio_req *req) 478eio_submit (eio_req *req)
828{ 479{
829 etp_submit (req); 480 etp_submit (EIO_POOL, req);
830} 481}
831 482
832unsigned int 483unsigned int
833eio_nreqs (void) 484eio_nreqs (void)
834{ 485{
835 return etp_nreqs (); 486 return etp_nreqs (EIO_POOL);
836} 487}
837 488
838unsigned int 489unsigned int
839eio_nready (void) 490eio_nready (void)
840{ 491{
841 return etp_nready (); 492 return etp_nready (EIO_POOL);
842} 493}
843 494
844unsigned int 495unsigned int
845eio_npending (void) 496eio_npending (void)
846{ 497{
847 return etp_npending (); 498 return etp_npending (EIO_POOL);
848} 499}
849 500
850unsigned int ecb_cold 501unsigned int ecb_cold
851eio_nthreads (void) 502eio_nthreads (void)
852{ 503{
853 return etp_nthreads (); 504 return etp_nthreads (EIO_POOL);
854} 505}
855 506
856void ecb_cold 507void ecb_cold
857eio_set_max_poll_time (double nseconds) 508eio_set_max_poll_time (double nseconds)
858{ 509{
859 etp_set_max_poll_time (nseconds); 510 etp_set_max_poll_time (EIO_POOL, nseconds);
860} 511}
861 512
862void ecb_cold 513void ecb_cold
863eio_set_max_poll_reqs (unsigned int maxreqs) 514eio_set_max_poll_reqs (unsigned int maxreqs)
864{ 515{
865 etp_set_max_poll_reqs (maxreqs); 516 etp_set_max_poll_reqs (EIO_POOL, maxreqs);
866} 517}
867 518
868void ecb_cold 519void ecb_cold
869eio_set_max_idle (unsigned int nthreads) 520eio_set_max_idle (unsigned int nthreads)
870{ 521{
871 etp_set_max_idle (nthreads); 522 etp_set_max_idle (EIO_POOL, nthreads);
872} 523}
873 524
874void ecb_cold 525void ecb_cold
875eio_set_idle_timeout (unsigned int seconds) 526eio_set_idle_timeout (unsigned int seconds)
876{ 527{
877 etp_set_idle_timeout (seconds); 528 etp_set_idle_timeout (EIO_POOL, seconds);
878} 529}
879 530
880void ecb_cold 531void ecb_cold
881eio_set_min_parallel (unsigned int nthreads) 532eio_set_min_parallel (unsigned int nthreads)
882{ 533{
883 etp_set_min_parallel (nthreads); 534 etp_set_min_parallel (EIO_POOL, nthreads);
884} 535}
885 536
886void ecb_cold 537void ecb_cold
887eio_set_max_parallel (unsigned int nthreads) 538eio_set_max_parallel (unsigned int nthreads)
888{ 539{
889 etp_set_max_parallel (nthreads); 540 etp_set_max_parallel (EIO_POOL, nthreads);
890} 541}
891 542
892int eio_poll (void) 543int eio_poll (void)
893{ 544{
894 return etp_poll (); 545 return etp_poll (EIO_POOL);
895} 546}
896 547
897/*****************************************************************************/ 548/*****************************************************************************/
898/* work around various missing functions */ 549/* 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 550
939#ifndef HAVE_UTIMES 551#ifndef HAVE_UTIMES
940 552
941# undef utimes 553# undef utimes
942# define utimes(path,times) eio__utimes (path, times) 554# define utimes(path,times) eio__utimes (path, times)
984 int res; 596 int res;
985 597
986#if HAVE_SYS_SYNCFS 598#if HAVE_SYS_SYNCFS
987 res = (int)syscall (__NR_syncfs, (int)(fd)); 599 res = (int)syscall (__NR_syncfs, (int)(fd));
988#else 600#else
989 res = -1; 601 res = EIO_ENOSYS ();
990 errno = ENOSYS;
991#endif 602#endif
992 603
993 if (res < 0 && errno == ENOSYS && fd >= 0) 604 if (res < 0 && errno == ENOSYS && fd >= 0)
994 sync (); 605 sync ();
995 606
1025} 636}
1026 637
1027static int 638static int
1028eio__fallocate (int fd, int mode, off_t offset, size_t len) 639eio__fallocate (int fd, int mode, off_t offset, size_t len)
1029{ 640{
1030#if HAVE_FALLOCATE 641#if HAVE_LINUX_FALLOCATE
1031 return fallocate (fd, mode, offset, len); 642 return fallocate (fd, mode, offset, len);
1032#else 643#else
1033 errno = ENOSYS; 644 return EIO_ENOSYS ();
1034 return -1;
1035#endif 645#endif
1036} 646}
1037 647
1038#if !HAVE_READAHEAD 648#if !HAVE_READAHEAD
1039# undef readahead 649# undef readahead
1054 todo -= len; 664 todo -= len;
1055 } 665 }
1056 666
1057 FUBd; 667 FUBd;
1058 668
1059 errno = 0; 669 /* linux's readahead basically only fails for EBADF or EINVAL (not mmappable) */
670 /* but not for e.g. EIO or eof, so we also never fail */
1060 return count; 671 return 0;
1061} 672}
1062 673
1063#endif 674#endif
1064 675
1065/* sendfile always needs emulation */ 676/* sendfile always needs emulation */
1100 711
1101 /* according to source inspection, this is correct, and useful behaviour */ 712 /* according to source inspection, this is correct, and useful behaviour */
1102 if (sbytes) 713 if (sbytes)
1103 res = sbytes; 714 res = sbytes;
1104 715
1105# elif defined (__APPLE__) 716# elif defined __APPLE__
1106 off_t sbytes = count; 717 off_t sbytes = count;
1107 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 718 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1108 719
1109 /* according to the manpage, sbytes is always valid */ 720 /* according to the manpage, sbytes is always valid */
1110 if (sbytes) 721 if (sbytes)
1137 HANDLE h = TO_SOCKET (ifd); 748 HANDLE h = TO_SOCKET (ifd);
1138 SetFilePointer (h, offset, 0, FILE_BEGIN); 749 SetFilePointer (h, offset, 0, FILE_BEGIN);
1139 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0); 750 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1140 751
1141#else 752#else
1142 res = -1; 753 res = EIO_ENOSYS ();
1143 errno = ENOSYS;
1144#endif 754#endif
1145 755
1146 /* we assume sendfile can copy at least 128mb in one go */ 756 /* we assume sendfile can copy at least 128mb in one go */
1147 if (res <= 128 * 1024 * 1024) 757 if (res <= 128 * 1024 * 1024)
1148 { 758 {
1335 945
1336/*****************************************************************************/ 946/*****************************************************************************/
1337/* requests implemented outside eio_execute, because they are so large */ 947/* requests implemented outside eio_execute, because they are so large */
1338 948
1339static void 949static void
1340eio__realpath (eio_req *req, etp_worker *self) 950eio__lseek (eio_req *req)
1341{ 951{
1342 char *rel = req->ptr1; 952 /* this usually gets optimised away completely, or your compiler sucks, */
953 /* or the whence constants really are not 0, 1, 2 */
954 int whence = req->int2 == EIO_SEEK_SET ? SEEK_SET
955 : req->int2 == EIO_SEEK_CUR ? SEEK_CUR
956 : req->int2 == EIO_SEEK_END ? SEEK_END
957 : req->int2;
958
959 req->offs = lseek (req->int1, req->offs, whence);
960 req->result = req->offs == (off_t)-1 ? -1 : 0;
961}
962
963/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
964static int
965eio__realpath (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
966{
1343 char *res; 967 char *res;
968 const char *rel = path;
1344 char *tmp1, *tmp2; 969 char *tmp1, *tmp2;
1345#if SYMLOOP_MAX > 32 970#if SYMLOOP_MAX > 32
1346 int symlinks = SYMLOOP_MAX; 971 int symlinks = SYMLOOP_MAX;
1347#else 972#else
1348 int symlinks = 32; 973 int symlinks = 32;
1349#endif 974#endif
1350 975
1351 req->result = -1;
1352
1353 errno = EINVAL; 976 errno = EINVAL;
1354 if (!rel) 977 if (!rel)
1355 return; 978 return -1;
1356 979
1357 errno = ENOENT; 980 errno = ENOENT;
1358 if (!*rel) 981 if (!*rel)
1359 return; 982 return -1;
1360 983
1361 if (!req->ptr2) 984 res = etp_tmpbuf_get (tmpbuf, PATH_MAX * 3);
1362 { 985#ifdef _WIN32
1363 X_LOCK (wrklock); 986 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; 987 return -1;
1371 }
1372 988
1373 res = req->ptr2; 989 symlinks = GetFullPathName (rel, PATH_MAX * 3, res, 0);
990
991 errno = ENAMETOOLONG;
992 if (symlinks >= PATH_MAX * 3)
993 return -1;
994
995 errno = EIO;
996 if (symlinks <= 0)
997 return -1;
998
999 return symlinks;
1000
1001#else
1374 tmp1 = res + PATH_MAX; 1002 tmp1 = res + PATH_MAX;
1375 tmp2 = tmp1 + PATH_MAX; 1003 tmp2 = tmp1 + PATH_MAX;
1376 1004
1377#if 0 /* disabled, the musl way to do things is just too racy */ 1005#if 0 /* disabled, the musl way to do things is just too racy */
1378#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1006#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1382 1010
1383 if (fd >= 0) 1011 if (fd >= 0)
1384 { 1012 {
1385 sprintf (tmp1, "/proc/self/fd/%d", fd); 1013 sprintf (tmp1, "/proc/self/fd/%d", fd);
1386 req->result = readlink (tmp1, res, PATH_MAX); 1014 req->result = readlink (tmp1, res, PATH_MAX);
1015 /* here we should probably stat the open file and the disk file, to make sure they still match */
1387 close (fd); 1016 close (fd);
1388
1389 /* here we should probably stat the open file and the disk file, to make sure they still match */
1390 1017
1391 if (req->result > 0) 1018 if (req->result > 0)
1392 goto done; 1019 goto done;
1393 } 1020 }
1394 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO) 1021 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO)
1395 return; 1022 return -1;
1396 } 1023 }
1397#endif 1024#endif
1398#endif 1025#endif
1399 1026
1400 if (*rel != '/') 1027 if (*rel != '/')
1401 { 1028 {
1029 int len;
1030
1031 errno = ENOENT;
1032 if (wd == EIO_INVALID_WD)
1033 return -1;
1034
1035 if (wd == EIO_CWD)
1036 {
1402 if (!getcwd (res, PATH_MAX)) 1037 if (!getcwd (res, PATH_MAX))
1403 return; 1038 return -1;
1039
1040 len = strlen (res);
1041 }
1042 else
1043 memcpy (res, wd->str, len = wd->len);
1404 1044
1405 if (res [1]) /* only use if not / */ 1045 if (res [1]) /* only use if not / */
1406 res += strlen (res); 1046 res += len;
1407 } 1047 }
1408 1048
1409 while (*rel) 1049 while (*rel)
1410 { 1050 {
1411 eio_ssize_t len, linklen; 1051 eio_ssize_t len, linklen;
1412 char *beg = rel; 1052 const char *beg = rel;
1413 1053
1414 while (*rel && *rel != '/') 1054 while (*rel && *rel != '/')
1415 ++rel; 1055 ++rel;
1416 1056
1417 len = rel - beg; 1057 len = rel - beg;
1429 1069
1430 if (beg [1] == '.' && len == 2) 1070 if (beg [1] == '.' && len == 2)
1431 { 1071 {
1432 /* .. - back up one component, if possible */ 1072 /* .. - back up one component, if possible */
1433 1073
1434 while (res != req->ptr2) 1074 while (res != tmpbuf->ptr)
1435 if (*--res == '/') 1075 if (*--res == '/')
1436 break; 1076 break;
1437 1077
1438 continue; 1078 continue;
1439 } 1079 }
1440 } 1080 }
1441 1081
1442 errno = ENAMETOOLONG; 1082 errno = ENAMETOOLONG;
1443 if (res + 1 + len + 1 >= tmp1) 1083 if (res + 1 + len + 1 >= tmp1)
1444 return; 1084 return -1;
1445 1085
1446 /* copy one component */ 1086 /* copy one component */
1447 *res = '/'; 1087 *res = '/';
1448 memcpy (res + 1, beg, len); 1088 memcpy (res + 1, beg, len);
1449 1089
1450 /* zero-terminate, for readlink */ 1090 /* zero-terminate, for readlink */
1451 res [len + 1] = 0; 1091 res [len + 1] = 0;
1452 1092
1453 /* now check if it's a symlink */ 1093 /* now check if it's a symlink */
1454 linklen = readlink (req->ptr2, tmp1, PATH_MAX); 1094 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1455 1095
1456 if (linklen < 0) 1096 if (linklen < 0)
1457 { 1097 {
1458 if (errno != EINVAL) 1098 if (errno != EINVAL)
1459 return; 1099 return -1;
1460 1100
1461 /* it's a normal directory. hopefully */ 1101 /* it's a normal directory. hopefully */
1462 res += len + 1; 1102 res += len + 1;
1463 } 1103 }
1464 else 1104 else
1466 /* yay, it was a symlink - build new path in tmp2 */ 1106 /* yay, it was a symlink - build new path in tmp2 */
1467 int rellen = strlen (rel); 1107 int rellen = strlen (rel);
1468 1108
1469 errno = ENAMETOOLONG; 1109 errno = ENAMETOOLONG;
1470 if (linklen + 1 + rellen >= PATH_MAX) 1110 if (linklen + 1 + rellen >= PATH_MAX)
1471 return; 1111 return -1;
1472 1112
1473 errno = ELOOP; 1113 errno = ELOOP;
1474 if (!--symlinks) 1114 if (!--symlinks)
1475 return; 1115 return -1;
1476 1116
1477 if (*tmp1 == '/') 1117 if (*tmp1 == '/')
1478 res = req->ptr2; /* symlink resolves to an absolute path */ 1118 res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1479 1119
1480 /* we need to be careful, as rel might point into tmp2 already */ 1120 /* we need to be careful, as rel might point into tmp2 already */
1481 memmove (tmp2 + linklen + 1, rel, rellen + 1); 1121 memmove (tmp2 + linklen + 1, rel, rellen + 1);
1482 tmp2 [linklen] = '/'; 1122 tmp2 [linklen] = '/';
1483 memcpy (tmp2, tmp1, linklen); 1123 memcpy (tmp2, tmp1, linklen);
1485 rel = tmp2; 1125 rel = tmp2;
1486 } 1126 }
1487 } 1127 }
1488 1128
1489 /* special case for the lone root path */ 1129 /* special case for the lone root path */
1490 if (res == req->ptr2) 1130 if (res == tmpbuf->ptr)
1491 *res++ = '/'; 1131 *res++ = '/';
1492 1132
1493 req->result = res - (char *)req->ptr2; 1133 return res - (char *)tmpbuf->ptr;
1494 1134#endif
1495done:
1496 req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1497} 1135}
1498 1136
1499static signed char 1137static signed char
1500eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1138eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1501{ 1139{
1689#ifdef _WIN32 1327#ifdef _WIN32
1690 { 1328 {
1691 int len = strlen ((const char *)req->ptr1); 1329 int len = strlen ((const char *)req->ptr1);
1692 char *path = malloc (MAX_PATH); 1330 char *path = malloc (MAX_PATH);
1693 const char *fmt; 1331 const char *fmt;
1332 const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1694 1333
1695 if (!len) 1334 if (!len)
1696 fmt = "./*"; 1335 fmt = "./*";
1697 else if (((const char *)req->ptr1)[len - 1] == '/' || ((const char *)req->ptr1)[len - 1] == '\\') 1336 else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1698 fmt = "%s*"; 1337 fmt = "%s*";
1699 else 1338 else
1700 fmt = "%s/*"; 1339 fmt = "%s/*";
1701 1340
1702 _snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1); 1341 _snprintf (path, MAX_PATH, fmt, reqpath);
1703 dirp = FindFirstFile (path, &entp); 1342 dirp = FindFirstFile (path, &entp);
1704 free (path); 1343 free (path);
1705 1344
1706 if (dirp == INVALID_HANDLE_VALUE) 1345 if (dirp == INVALID_HANDLE_VALUE)
1707 { 1346 {
1708 dirp = 0;
1709
1710 /* should steal _dosmaperr */ 1347 /* should steal _dosmaperr */
1711 switch (GetLastError ()) 1348 switch (GetLastError ())
1712 { 1349 {
1713 case ERROR_FILE_NOT_FOUND: 1350 case ERROR_FILE_NOT_FOUND:
1714 req->result = 0; 1351 req->result = 0;
1715 break; 1352 break;
1716 1353
1717 case ERROR_INVALID_NAME: 1354 case ERROR_INVALID_NAME:
1718 case ERROR_PATH_NOT_FOUND: 1355 case ERROR_PATH_NOT_FOUND:
1719 case ERROR_NO_MORE_FILES: 1356 case ERROR_NO_MORE_FILES:
1720 errno = ENOENT; 1357 errno = ENOENT;
1721 break; 1358 break;
1722 1359
1723 case ERROR_NOT_ENOUGH_MEMORY: 1360 case ERROR_NOT_ENOUGH_MEMORY:
1724 errno = ENOMEM; 1361 errno = ENOMEM;
1725 break; 1362 break;
1726 1363
1727 default: 1364 default:
1728 errno = EINVAL; 1365 errno = EINVAL;
1729 break; 1366 break;
1730 } 1367 }
1368
1369 return;
1731 } 1370 }
1732 } 1371 }
1733#else 1372#else
1373 #if HAVE_AT
1374 if (req->wd)
1375 {
1376 int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1377
1378 if (fd < 0)
1379 return;
1380
1381 dirp = fdopendir (fd);
1382
1383 if (!dirp)
1384 close (fd);
1385 }
1386 else
1734 dirp = opendir (req->ptr1); 1387 dirp = opendir (req->ptr1);
1388 #else
1389 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
1390 #endif
1391
1392 if (!dirp)
1393 return;
1735#endif 1394#endif
1736 1395
1737 if (req->flags & EIO_FLAG_PTR1_FREE) 1396 if (req->flags & EIO_FLAG_PTR1_FREE)
1738 free (req->ptr1); 1397 free (req->ptr1);
1739 1398
1740 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1399 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1741 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1400 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1742 req->ptr2 = names = malloc (namesalloc); 1401 req->ptr2 = names = malloc (namesalloc);
1743 1402
1744 if (dirp && names && (!flags || dents)) 1403 if (!names || (flags && !dents))
1404 return;
1405
1745 for (;;) 1406 for (;;)
1746 { 1407 {
1747 int done; 1408 int done;
1748 1409
1749#ifdef _WIN32 1410#ifdef _WIN32
1750 done = !dirp; 1411 done = !dirp;
1751#else 1412#else
1752 errno = 0; 1413 errno = 0;
1753 entp = readdir (dirp); 1414 entp = readdir (dirp);
1754 done = !entp; 1415 done = !entp;
1755#endif 1416#endif
1756 1417
1757 if (done) 1418 if (done)
1758 { 1419 {
1759#ifndef _WIN32 1420#ifndef _WIN32
1760 int old_errno = errno; 1421 int old_errno = errno;
1761 closedir (dirp); 1422 closedir (dirp);
1762 errno = old_errno; 1423 errno = old_errno;
1763 1424
1764 if (errno) 1425 if (errno)
1765 break; 1426 break;
1766#endif 1427#endif
1767 1428
1768 /* sort etc. */ 1429 /* sort etc. */
1769 req->int1 = flags; 1430 req->int1 = flags;
1770 req->result = dentoffs; 1431 req->result = dentoffs;
1771 1432
1772 if (flags & EIO_READDIR_STAT_ORDER) 1433 if (flags & EIO_READDIR_STAT_ORDER)
1773 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits); 1434 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1774 else if (flags & EIO_READDIR_DIRS_FIRST) 1435 else if (flags & EIO_READDIR_DIRS_FIRST)
1775 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1436 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1776 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */ 1437 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1777 else 1438 else
1439 {
1440 /* in this case, all is known, and we just put dirs first and sort them */
1441 eio_dirent *oth = dents + dentoffs;
1442 eio_dirent *dir = dents;
1443
1444 /* now partition dirs to the front, and non-dirs to the back */
1445 /* by walking from both sides and swapping if necessary */
1446 while (oth > dir)
1447 {
1448 if (dir->type == EIO_DT_DIR)
1449 ++dir;
1450 else if ((--oth)->type == EIO_DT_DIR)
1451 {
1452 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1453
1454 ++dir;
1455 }
1456 }
1457
1458 /* now sort the dirs only (dirs all have the same score) */
1459 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1460 }
1461
1462 break;
1463 }
1464
1465 /* now add the entry to our list(s) */
1466 name = D_NAME (entp);
1467
1468 /* skip . and .. entries */
1469 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1470 {
1471 int len = D_NAMLEN (entp) + 1;
1472
1473 while (ecb_expect_false (namesoffs + len > namesalloc))
1474 {
1475 namesalloc *= 2;
1476 req->ptr2 = names = realloc (names, namesalloc);
1477
1478 if (!names)
1479 break;
1480 }
1481
1482 memcpy (names + namesoffs, name, len);
1483
1484 if (dents)
1485 {
1486 struct eio_dirent *ent;
1487
1488 if (ecb_expect_false (dentoffs == dentalloc))
1778 { 1489 {
1779 /* in this case, all is known, and we just put dirs first and sort them */ 1490 dentalloc *= 2;
1491 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1492
1493 if (!dents)
1494 break;
1495 }
1496
1780 eio_dirent *oth = dents + dentoffs; 1497 ent = dents + dentoffs;
1781 eio_dirent *dir = dents;
1782 1498
1783 /* now partition dirs to the front, and non-dirs to the back */ 1499 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1784 /* by walking from both sides and swapping if necessary */ 1500 ent->namelen = len - 1;
1785 while (oth > dir) 1501 ent->inode = D_INO (entp);
1502
1503 inode_bits |= ent->inode;
1504
1505 switch (D_TYPE (entp))
1506 {
1507 default:
1508 ent->type = EIO_DT_UNKNOWN;
1509 flags |= EIO_READDIR_FOUND_UNKNOWN;
1510 break;
1511
1512 #ifdef DT_FIFO
1513 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1514 #endif
1515 #ifdef DT_CHR
1516 case DT_CHR: ent->type = EIO_DT_CHR; break;
1517 #endif
1518 #ifdef DT_MPC
1519 case DT_MPC: ent->type = EIO_DT_MPC; break;
1520 #endif
1521 #ifdef DT_DIR
1522 case DT_DIR: ent->type = EIO_DT_DIR; break;
1523 #endif
1524 #ifdef DT_NAM
1525 case DT_NAM: ent->type = EIO_DT_NAM; break;
1526 #endif
1527 #ifdef DT_BLK
1528 case DT_BLK: ent->type = EIO_DT_BLK; break;
1529 #endif
1530 #ifdef DT_MPB
1531 case DT_MPB: ent->type = EIO_DT_MPB; break;
1532 #endif
1533 #ifdef DT_REG
1534 case DT_REG: ent->type = EIO_DT_REG; break;
1535 #endif
1536 #ifdef DT_NWK
1537 case DT_NWK: ent->type = EIO_DT_NWK; break;
1538 #endif
1539 #ifdef DT_CMP
1540 case DT_CMP: ent->type = EIO_DT_CMP; break;
1541 #endif
1542 #ifdef DT_LNK
1543 case DT_LNK: ent->type = EIO_DT_LNK; break;
1544 #endif
1545 #ifdef DT_SOCK
1546 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1547 #endif
1548 #ifdef DT_DOOR
1549 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1550 #endif
1551 #ifdef DT_WHT
1552 case DT_WHT: ent->type = EIO_DT_WHT; break;
1553 #endif
1554 }
1555
1556 ent->score = 7;
1557
1558 if (flags & EIO_READDIR_DIRS_FIRST)
1559 {
1560 if (ent->type == EIO_DT_UNKNOWN)
1786 { 1561 {
1787 if (dir->type == EIO_DT_DIR) 1562 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1788 ++dir; 1563 ent->score = 1;
1789 else if ((--oth)->type == EIO_DT_DIR) 1564 else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1790 { 1565 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 } 1566 }
1796 1567 else if (ent->type == EIO_DT_DIR)
1797 /* now sort the dirs only (dirs all have the same score) */ 1568 ent->score = 0;
1798 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1799 } 1569 }
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 } 1570 }
1820 1571
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; 1572 namesoffs += len;
1912 ++dentoffs; 1573 ++dentoffs;
1913 } 1574 }
1914 1575
1915 if (EIO_CANCELLED (req)) 1576 if (EIO_CANCELLED (req))
1916 { 1577 {
1917 errno = ECANCELED; 1578 errno = ECANCELED;
1918 break; 1579 break;
1919 } 1580 }
1920 1581
1921#ifdef _WIN32 1582#ifdef _WIN32
1922 if (!FindNextFile (dirp, &entp)) 1583 if (!FindNextFile (dirp, &entp))
1923 { 1584 {
1924 FindClose (dirp); 1585 FindClose (dirp);
1925 dirp = 0; 1586 dirp = 0;
1926 } 1587 }
1927#endif 1588#endif
1928 } 1589 }
1929} 1590}
1591
1592/*****************************************************************************/
1593/* working directory stuff */
1594/* various deficiencies in the posix 2008 api force us to */
1595/* keep the absolute path in string form at all times */
1596/* fuck yeah. */
1597
1598#if !HAVE_AT
1599
1600/* a bit like realpath, but usually faster because it doesn'T have to return */
1601/* an absolute or canonical path */
1602static const char *
1603wd_expand (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
1604{
1605 if (!wd || *path == '/')
1606 return path;
1607
1608 if (path [0] == '.' && !path [1])
1609 return wd->str;
1610
1611 {
1612 int l1 = wd->len;
1613 int l2 = strlen (path);
1614
1615 char *res = etp_tmpbuf_get (tmpbuf, l1 + l2 + 2);
1616
1617 memcpy (res, wd->str, l1);
1618 res [l1] = '/';
1619 memcpy (res + l1 + 1, path, l2 + 1);
1620
1621 return res;
1622 }
1623}
1624
1625#endif
1626
1627static eio_wd
1628eio__wd_open_sync (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
1629{
1630 int fd;
1631 eio_wd res;
1632 int len = eio__realpath (tmpbuf, wd, path);
1633
1634 if (len < 0)
1635 return EIO_INVALID_WD;
1636
1637#if HAVE_AT
1638 fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1639
1640 if (fd < 0)
1641 return EIO_INVALID_WD;
1642#endif
1643
1644 res = malloc (sizeof (*res) + len); /* one extra 0-byte */
1645
1646#if HAVE_AT
1647 res->fd = fd;
1648#endif
1649
1650 res->len = len;
1651 memcpy (res->str, tmpbuf->ptr, len);
1652 res->str [len] = 0;
1653
1654 return res;
1655}
1656
1657eio_wd
1658eio_wd_open_sync (eio_wd wd, const char *path)
1659{
1660 struct etp_tmpbuf tmpbuf = { };
1661 wd = eio__wd_open_sync (&tmpbuf, wd, path);
1662 free (tmpbuf.ptr);
1663
1664 return wd;
1665}
1666
1667void
1668eio_wd_close_sync (eio_wd wd)
1669{
1670 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
1671 {
1672 #if HAVE_AT
1673 close (wd->fd);
1674 #endif
1675 free (wd);
1676 }
1677}
1678
1679#if HAVE_AT
1680
1681/* they forgot these */
1682
1683static int
1684eio__truncateat (int dirfd, const char *path, off_t length)
1685{
1686 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
1687 int res;
1688
1689 if (fd < 0)
1690 return fd;
1691
1692 res = ftruncate (fd, length);
1693 close (fd);
1694 return res;
1695}
1696
1697static int
1698eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
1699{
1700 int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC);
1701 int res;
1702
1703 if (fd < 0)
1704 return fd;
1705
1706 res = fstatvfs (fd, buf);
1707 close (fd);
1708 return res;
1709
1710}
1711
1712#endif
1930 1713
1931/*****************************************************************************/ 1714/*****************************************************************************/
1932 1715
1933#define ALLOC(len) \ 1716#define ALLOC(len) \
1934 if (!req->ptr2) \ 1717 if (!req->ptr2) \
1935 { \ 1718 { \
1936 X_LOCK (wrklock); \ 1719 X_LOCK (EIO_POOL->wrklock); \
1937 req->flags |= EIO_FLAG_PTR2_FREE; \ 1720 req->flags |= EIO_FLAG_PTR2_FREE; \
1938 X_UNLOCK (wrklock); \ 1721 X_UNLOCK (EIO_POOL->wrklock); \
1939 req->ptr2 = malloc (len); \ 1722 req->ptr2 = malloc (len); \
1940 if (!req->ptr2) \ 1723 if (!req->ptr2) \
1941 { \ 1724 { \
1942 errno = ENOMEM; \ 1725 errno = ENOMEM; \
1943 req->result = -1; \ 1726 req->result = -1; \
1944 break; \ 1727 break; \
1945 } \ 1728 } \
1946 } 1729 }
1947 1730
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/*****************************************************************************/ 1731/*****************************************************************************/
2032 1732
2033int ecb_cold 1733int ecb_cold
2034eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1734eio_init (void (*want_poll)(void), void (*done_poll)(void))
2035{ 1735{
2036#if !HAVE_PREADWRITE 1736 eio_want_poll_cb = want_poll;
2037 X_MUTEX_CREATE (preadwritelock); 1737 eio_done_poll_cb = done_poll;
2038#endif
2039 1738
2040 return etp_init (want_poll, done_poll); 1739 return etp_init (EIO_POOL, 0, 0, 0);
2041} 1740}
2042 1741
2043ecb_inline void 1742ecb_inline void
2044eio_api_destroy (eio_req *req) 1743eio_api_destroy (eio_req *req)
2045{ 1744{
2046 free (req); 1745 free (req);
2047} 1746}
2048 1747
2049#define REQ(rtype) \ 1748#define REQ(rtype) \
2050 eio_req *req; \ 1749 eio_req *req; \
2051 \ 1750 \
2052 req = (eio_req *)calloc (1, sizeof *req); \ 1751 req = (eio_req *)calloc (1, sizeof *req); \
2053 if (!req) \ 1752 if (!req) \
2054 return 0; \ 1753 return 0; \
2068 { \ 1767 { \
2069 eio_api_destroy (req); \ 1768 eio_api_destroy (req); \
2070 return 0; \ 1769 return 0; \
2071 } 1770 }
2072 1771
1772#define SINGLEDOT(ptr) (0[(char *)(ptr)] == '.' && !1[(char *)(ptr)])
1773
2073static void 1774static void
2074eio_execute (etp_worker *self, eio_req *req) 1775eio_execute (etp_worker *self, eio_req *req)
2075{ 1776{
1777#if HAVE_AT
1778 int dirfd;
1779#else
1780 const char *path;
1781#endif
1782
2076 if (ecb_expect_false (EIO_CANCELLED (req))) 1783 if (ecb_expect_false (EIO_CANCELLED (req)))
2077 { 1784 {
2078 req->result = -1; 1785 req->result = -1;
2079 req->errorno = ECANCELED; 1786 req->errorno = ECANCELED;
2080 return; 1787 return;
2081 } 1788 }
2082 1789
1790 if (ecb_expect_false (req->wd == EIO_INVALID_WD))
1791 {
1792 req->result = -1;
1793 req->errorno = ENOENT;
1794 return;
1795 }
1796
1797 if (req->type >= EIO_OPEN)
1798 {
1799 #if HAVE_AT
1800 dirfd = WD2FD (req->wd);
1801 #else
1802 path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1803 #endif
1804 }
1805
2083 switch (req->type) 1806 switch (req->type)
2084 { 1807 {
1808 case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
1809 req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
1810 break;
1811 case EIO_WD_CLOSE: req->result = 0;
1812 eio_wd_close_sync (req->wd); break;
1813
1814 case EIO_SEEK: eio__lseek (req); break;
2085 case EIO_READ: ALLOC (req->size); 1815 case EIO_READ: ALLOC (req->size);
2086 req->result = req->offs >= 0 1816 req->result = req->offs >= 0
2087 ? pread (req->int1, req->ptr2, req->size, req->offs) 1817 ? pread (req->int1, req->ptr2, req->size, req->offs)
2088 : read (req->int1, req->ptr2, req->size); break; 1818 : read (req->int1, req->ptr2, req->size); break;
2089 case EIO_WRITE: req->result = req->offs >= 0 1819 case EIO_WRITE: req->result = req->offs >= 0
2090 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 1820 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
2091 : write (req->int1, req->ptr2, req->size); break; 1821 : write (req->int1, req->ptr2, req->size); break;
2092 1822
1823 case EIO_FCNTL: req->result = fcntl (req->int1, (int) req->int2, req->ptr2); break;
1824 case EIO_IOCTL: req->result = ioctl (req->int1, (unsigned long)req->int2, req->ptr2); break;
1825
2093 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 1826 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; 1827 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
2095 1828
1829#if HAVE_AT
1830
2096 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1831 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2097 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 1832 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
2098 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1833 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1834 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
1835 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
1836 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
1837 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
1838 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
1839
1840 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
1841 case EIO_RMDIR: /* complications arise because "." cannot be removed, so we might have to expand */
1842 req->result = req->wd && SINGLEDOT (req->ptr1)
1843 ? rmdir (req->wd->str)
1844 : unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
1845 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
1846 case EIO_RENAME: /* complications arise because "." cannot be renamed, so we might have to expand */
1847 req->result = req->wd && SINGLEDOT (req->ptr1)
1848 ? rename (req->wd->str, req->ptr2)
1849 : renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
1850 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
1851 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
1852 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1853 case EIO_READLINK: ALLOC (PATH_MAX);
1854 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
1855 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1856 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1857 case EIO_UTIME:
1858 case EIO_FUTIME:
1859 {
1860 struct timespec ts[2];
1861 struct timespec *times;
1862
1863 if (req->nv1 != -1. || req->nv2 != -1.)
1864 {
1865 ts[0].tv_sec = req->nv1;
1866 ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
1867 ts[1].tv_sec = req->nv2;
1868 ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
1869
1870 times = ts;
1871 }
1872 else
1873 times = 0;
1874
1875 req->result = req->type == EIO_FUTIME
1876 ? futimens (req->int1, times)
1877 : utimensat (dirfd, req->ptr1, times, 0);
1878 }
1879 break;
1880
1881#else
1882
1883 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1884 req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
1885 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2099 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 1886 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
1887 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
1888 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
1889 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
1890 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
1891
1892 case EIO_UNLINK: req->result = unlink (path ); break;
1893 case EIO_RMDIR: req->result = rmdir (path ); break;
1894 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
1895 case EIO_RENAME: req->result = rename (path , req->ptr2); break;
1896 case EIO_LINK: req->result = link (path , req->ptr2); break;
1897 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
1898 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
1899 case EIO_READLINK: ALLOC (PATH_MAX);
1900 req->result = readlink (path, req->ptr2, PATH_MAX); break;
1901 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1902 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
1903
1904 case EIO_UTIME:
1905 case EIO_FUTIME:
1906 {
1907 struct timeval tv[2];
1908 struct timeval *times;
1909
1910 if (req->nv1 != -1. || req->nv2 != -1.)
1911 {
1912 tv[0].tv_sec = req->nv1;
1913 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
1914 tv[1].tv_sec = req->nv2;
1915 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
1916
1917 times = tv;
1918 }
1919 else
1920 times = 0;
1921
1922 req->result = req->type == EIO_FUTIME
1923 ? futimes (req->int1, times)
1924 : utimes (req->ptr1, times);
1925 }
1926 break;
1927
1928#endif
1929
1930 case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
1931 {
1932 ALLOC (req->result);
1933 memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
1934 }
1935 break;
1936
2100 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1937 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2101 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 1938 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
2102 1939
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)); 1940 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2106 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 1941 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2107 1942
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; 1943 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; 1944 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; 1945 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2114 1946
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; 1947 case EIO_CLOSE: req->result = close (req->int1); break;
2117 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 1948 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; 1949 case EIO_SYNC: req->result = 0; sync (); break;
2132 case EIO_FSYNC: req->result = fsync (req->int1); break; 1950 case EIO_FSYNC: req->result = fsync (req->int1); break;
2133 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 1951 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2134 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break; 1952 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; 1953 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); 1972 req->result = select (0, 0, 0, 0, &tv);
2155 } 1973 }
2156#endif 1974#endif
2157 break; 1975 break;
2158 1976
2159 case EIO_UTIME: 1977#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: 1978 case EIO_GROUP:
2184 abort (); /* handled in eio_request */ 1979 abort (); /* handled in eio_request */
1980#endif
2185 1981
2186 case EIO_NOP: 1982 case EIO_NOP:
2187 req->result = 0; 1983 req->result = 0;
2188 break; 1984 break;
2189 1985
2190 case EIO_CUSTOM: 1986 case EIO_CUSTOM:
2191 req->feed (req); 1987 req->feed (req);
2192 break; 1988 break;
2193 1989
2194 default: 1990 default:
2195 errno = ENOSYS;
2196 req->result = -1; 1991 req->result = EIO_ENOSYS ();
2197 break; 1992 break;
2198 } 1993 }
2199 1994
2200 req->errorno = errno; 1995 req->errorno = errno;
2201} 1996}
2202 1997
2203#ifndef EIO_NO_WRAPPERS 1998#ifndef EIO_NO_WRAPPERS
2204 1999
2000eio_req *eio_wd_open (const char *path, int pri, eio_cb cb, void *data)
2001{
2002 REQ (EIO_WD_OPEN); PATH; SEND;
2003}
2004
2005eio_req *eio_wd_close (eio_wd wd, int pri, eio_cb cb, void *data)
2006{
2007 REQ (EIO_WD_CLOSE); req->wd = wd; SEND;
2008}
2009
2205eio_req *eio_nop (int pri, eio_cb cb, void *data) 2010eio_req *eio_nop (int pri, eio_cb cb, void *data)
2206{ 2011{
2207 REQ (EIO_NOP); SEND; 2012 REQ (EIO_NOP); SEND;
2208} 2013}
2209 2014
2270eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data) 2075eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data)
2271{ 2076{
2272 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND; 2077 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND;
2273} 2078}
2274 2079
2080eio_req *eio_seek (int fd, off_t offset, int whence, int pri, eio_cb cb, void *data)
2081{
2082 REQ (EIO_SEEK); req->int1 = fd; req->offs = offset; req->int2 = whence; SEND;
2083}
2084
2275eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data) 2085eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2276{ 2086{
2277 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND; 2087 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
2278} 2088}
2279 2089
2280eio_req *eio_write (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data) 2090eio_req *eio_write (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2281{ 2091{
2282 REQ (EIO_WRITE); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND; 2092 REQ (EIO_WRITE); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
2093}
2094
2095eio_req *eio_fcntl (int fd, int cmd, void *arg, int pri, eio_cb cb, void *data)
2096{
2097 REQ (EIO_IOCTL); req->int1 = fd; req->int2 = cmd; req->ptr2 = arg; SEND;
2098}
2099
2100eio_req *eio_ioctl (int fd, unsigned long request, void *buf, int pri, eio_cb cb, void *data)
2101{
2102 REQ (EIO_IOCTL); req->int1 = fd; req->int2 = request; req->ptr2 = buf; SEND;
2283} 2103}
2284 2104
2285eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data) 2105eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data)
2286{ 2106{
2287 REQ (EIO_FSTAT); req->int1 = fd; SEND; 2107 REQ (EIO_FSTAT); req->int1 = fd; SEND;
2475void 2295void
2476eio_grp_add (eio_req *grp, eio_req *req) 2296eio_grp_add (eio_req *grp, eio_req *req)
2477{ 2297{
2478 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2)); 2298 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
2479 2299
2480 grp->flags |= EIO_FLAG_GROUPADD; 2300 grp->flags |= ETP_FLAG_GROUPADD;
2481 2301
2482 ++grp->size; 2302 ++grp->size;
2483 req->grp = grp; 2303 req->grp = grp;
2484 2304
2485 req->grp_prev = 0; 2305 req->grp_prev = 0;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines