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.142 by root, Sun May 1 17:15:45 2016 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines