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

Comparing libeio/eio.c (file contents):
Revision 1.103 by root, Thu Sep 15 13:20:54 2011 UTC vs.
Revision 1.144 by root, Tue Dec 27 09:58:44 2016 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines