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.137 by root, Thu Jun 25 17:40:24 2015 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines