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

Comparing libeio/eio.c (file contents):
Revision 1.105 by root, Mon Sep 26 18:23:18 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)
296
297/*****************************************************************************/ 342/*****************************************************************************/
298 343
299struct tmpbuf 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
300{ 358{
301 void *ptr; 359#if HAVE_AT
360 int fd;
361#endif
302 int len; 362 int len;
363 char str[1]; /* actually, a 0-terminated canonical path */
303}; 364};
304
305static void *
306tmpbuf_get (struct tmpbuf *buf, int len)
307{
308 if (buf->len < len)
309 {
310 free (buf->ptr);
311 buf->ptr = malloc (buf->len = len);
312 }
313
314 return buf->ptr;
315}
316 365
317/*****************************************************************************/ 366/*****************************************************************************/
318 367
319#define ETP_PRI_MIN EIO_PRI_MIN 368#define ETP_PRI_MIN EIO_PRI_MIN
320#define ETP_PRI_MAX EIO_PRI_MAX 369#define ETP_PRI_MAX EIO_PRI_MAX
321 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
322struct etp_worker; 381struct etp_worker;
323
324#define ETP_REQ eio_req 382#define ETP_REQ eio_req
325#define ETP_DESTROY(req) eio_destroy (req) 383#define ETP_DESTROY(req) eio_destroy (req)
326static int eio_finish (eio_req *req); 384static int eio_finish (eio_req *req);
327#define ETP_FINISH(req) eio_finish (req) 385#define ETP_FINISH(req) eio_finish (req)
328static void eio_execute (struct etp_worker *self, eio_req *req); 386static void eio_execute (struct etp_worker *self, eio_req *req);
329#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 387#define ETP_EXECUTE(wrk,req) eio_execute (wrk, req)
330 388
331/*****************************************************************************/ 389#include "etp.c"
332 390
333#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 391static struct etp_pool eio_pool;
334 392#define EIO_POOL (&eio_pool)
335/* calculate time difference in ~1/EIO_TICKS of a second */
336ecb_inline int
337tvdiff (struct timeval *tv1, struct timeval *tv2)
338{
339 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
340 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
341}
342
343static unsigned int started, idle, wanted = 4;
344
345static void (*want_poll_cb) (void);
346static void (*done_poll_cb) (void);
347
348static unsigned int max_poll_time; /* reslock */
349static unsigned int max_poll_reqs; /* reslock */
350
351static unsigned int nreqs; /* reqlock */
352static unsigned int nready; /* reqlock */
353static unsigned int npending; /* reqlock */
354static unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
355static unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
356
357static xmutex_t wrklock;
358static xmutex_t reslock;
359static xmutex_t reqlock;
360static xcond_t reqwait;
361
362#if !HAVE_PREADWRITE
363/*
364 * make our pread/pwrite emulation safe against themselves, but not against
365 * normal read/write by using a mutex. slows down execution a lot,
366 * but that's your problem, not mine.
367 */
368static xmutex_t preadwritelock;
369#endif
370
371typedef struct etp_worker
372{
373 struct tmpbuf tmpbuf;
374
375 /* locked by wrklock */
376 struct etp_worker *prev, *next;
377
378 xthread_t tid;
379
380#ifdef ETP_WORKER_COMMON
381 ETP_WORKER_COMMON
382#endif
383} etp_worker;
384
385static etp_worker wrk_first; /* NOT etp */
386
387#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
388#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
389
390/* worker threads management */
391
392static void ecb_cold
393etp_worker_clear (etp_worker *wrk)
394{
395}
396
397static void ecb_cold
398etp_worker_free (etp_worker *wrk)
399{
400 free (wrk->tmpbuf.ptr);
401
402 wrk->next->prev = wrk->prev;
403 wrk->prev->next = wrk->next;
404
405 free (wrk);
406}
407
408static unsigned int
409etp_nreqs (void)
410{
411 int retval;
412 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
413 retval = nreqs;
414 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
415 return retval;
416}
417
418static unsigned int
419etp_nready (void)
420{
421 unsigned int retval;
422
423 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
424 retval = nready;
425 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
426
427 return retval;
428}
429
430static unsigned int
431etp_npending (void)
432{
433 unsigned int retval;
434
435 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
436 retval = npending;
437 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
438
439 return retval;
440}
441
442static unsigned int
443etp_nthreads (void)
444{
445 unsigned int retval;
446
447 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
448 retval = started;
449 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
450
451 return retval;
452}
453
454/*
455 * a somewhat faster data structure might be nice, but
456 * with 8 priorities this actually needs <20 insns
457 * per shift, the most expensive operation.
458 */
459typedef struct {
460 ETP_REQ *qs[ETP_NUM_PRI], *qe[ETP_NUM_PRI]; /* qstart, qend */
461 int size;
462} etp_reqq;
463
464static etp_reqq req_queue;
465static etp_reqq res_queue;
466
467static void ecb_noinline ecb_cold
468reqq_init (etp_reqq *q)
469{
470 int pri;
471
472 for (pri = 0; pri < ETP_NUM_PRI; ++pri)
473 q->qs[pri] = q->qe[pri] = 0;
474
475 q->size = 0;
476}
477
478static int ecb_noinline
479reqq_push (etp_reqq *q, ETP_REQ *req)
480{
481 int pri = req->pri;
482 req->next = 0;
483
484 if (q->qe[pri])
485 {
486 q->qe[pri]->next = req;
487 q->qe[pri] = req;
488 }
489 else
490 q->qe[pri] = q->qs[pri] = req;
491
492 return q->size++;
493}
494
495static ETP_REQ * ecb_noinline
496reqq_shift (etp_reqq *q)
497{
498 int pri;
499
500 if (!q->size)
501 return 0;
502
503 --q->size;
504
505 for (pri = ETP_NUM_PRI; pri--; )
506 {
507 eio_req *req = q->qs[pri];
508
509 if (req)
510 {
511 if (!(q->qs[pri] = (eio_req *)req->next))
512 q->qe[pri] = 0;
513
514 return req;
515 }
516 }
517
518 abort ();
519}
520
521static int ecb_cold
522etp_init (void (*want_poll)(void), void (*done_poll)(void))
523{
524 X_MUTEX_CREATE (wrklock);
525 X_MUTEX_CREATE (reslock);
526 X_MUTEX_CREATE (reqlock);
527 X_COND_CREATE (reqwait);
528
529 reqq_init (&req_queue);
530 reqq_init (&res_queue);
531
532 wrk_first.next =
533 wrk_first.prev = &wrk_first;
534
535 started = 0;
536 idle = 0;
537 nreqs = 0;
538 nready = 0;
539 npending = 0;
540
541 want_poll_cb = want_poll;
542 done_poll_cb = done_poll;
543
544 return 0;
545}
546
547X_THREAD_PROC (etp_proc);
548
549static void ecb_cold
550etp_start_thread (void)
551{
552 etp_worker *wrk = calloc (1, sizeof (etp_worker));
553
554 /*TODO*/
555 assert (("unable to allocate worker thread data", wrk));
556
557 X_LOCK (wrklock);
558
559 if (thread_create (&wrk->tid, etp_proc, (void *)wrk))
560 {
561 wrk->prev = &wrk_first;
562 wrk->next = wrk_first.next;
563 wrk_first.next->prev = wrk;
564 wrk_first.next = wrk;
565 ++started;
566 }
567 else
568 free (wrk);
569
570 X_UNLOCK (wrklock);
571}
572
573static void
574etp_maybe_start_thread (void)
575{
576 if (ecb_expect_true (etp_nthreads () >= wanted))
577 return;
578
579 /* todo: maybe use idle here, but might be less exact */
580 if (ecb_expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
581 return;
582
583 etp_start_thread ();
584}
585
586static void ecb_cold
587etp_end_thread (void)
588{
589 eio_req *req = calloc (1, sizeof (eio_req)); /* will be freed by worker */
590
591 req->type = -1;
592 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
593
594 X_LOCK (reqlock);
595 reqq_push (&req_queue, req);
596 X_COND_SIGNAL (reqwait);
597 X_UNLOCK (reqlock);
598
599 X_LOCK (wrklock);
600 --started;
601 X_UNLOCK (wrklock);
602}
603
604static int
605etp_poll (void)
606{
607 unsigned int maxreqs;
608 unsigned int maxtime;
609 struct timeval tv_start, tv_now;
610
611 X_LOCK (reslock);
612 maxreqs = max_poll_reqs;
613 maxtime = max_poll_time;
614 X_UNLOCK (reslock);
615
616 if (maxtime)
617 gettimeofday (&tv_start, 0);
618
619 for (;;)
620 {
621 ETP_REQ *req;
622
623 etp_maybe_start_thread ();
624
625 X_LOCK (reslock);
626 req = reqq_shift (&res_queue);
627
628 if (req)
629 {
630 --npending;
631
632 if (!res_queue.size && done_poll_cb)
633 done_poll_cb ();
634 }
635
636 X_UNLOCK (reslock);
637
638 if (!req)
639 return 0;
640
641 X_LOCK (reqlock);
642 --nreqs;
643 X_UNLOCK (reqlock);
644
645 if (ecb_expect_false (req->type == EIO_GROUP && req->size))
646 {
647 req->int1 = 1; /* mark request as delayed */
648 continue;
649 }
650 else
651 {
652 int res = ETP_FINISH (req);
653 if (ecb_expect_false (res))
654 return res;
655 }
656
657 if (ecb_expect_false (maxreqs && !--maxreqs))
658 break;
659
660 if (maxtime)
661 {
662 gettimeofday (&tv_now, 0);
663
664 if (tvdiff (&tv_start, &tv_now) >= maxtime)
665 break;
666 }
667 }
668
669 errno = EAGAIN;
670 return -1;
671}
672
673static void
674etp_cancel (ETP_REQ *req)
675{
676 req->cancelled = 1;
677
678 eio_grp_cancel (req);
679}
680
681static void
682etp_submit (ETP_REQ *req)
683{
684 req->pri -= ETP_PRI_MIN;
685
686 if (ecb_expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
687 if (ecb_expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
688
689 if (ecb_expect_false (req->type == EIO_GROUP))
690 {
691 /* I hope this is worth it :/ */
692 X_LOCK (reqlock);
693 ++nreqs;
694 X_UNLOCK (reqlock);
695
696 X_LOCK (reslock);
697
698 ++npending;
699
700 if (!reqq_push (&res_queue, req) && want_poll_cb)
701 want_poll_cb ();
702
703 X_UNLOCK (reslock);
704 }
705 else
706 {
707 X_LOCK (reqlock);
708 ++nreqs;
709 ++nready;
710 reqq_push (&req_queue, req);
711 X_COND_SIGNAL (reqwait);
712 X_UNLOCK (reqlock);
713
714 etp_maybe_start_thread ();
715 }
716}
717
718static void ecb_cold
719etp_set_max_poll_time (double nseconds)
720{
721 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
722 max_poll_time = nseconds * EIO_TICKS;
723 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
724}
725
726static void ecb_cold
727etp_set_max_poll_reqs (unsigned int maxreqs)
728{
729 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
730 max_poll_reqs = maxreqs;
731 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
732}
733
734static void ecb_cold
735etp_set_max_idle (unsigned int nthreads)
736{
737 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
738 max_idle = nthreads;
739 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
740}
741
742static void ecb_cold
743etp_set_idle_timeout (unsigned int seconds)
744{
745 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
746 idle_timeout = seconds;
747 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
748}
749
750static void ecb_cold
751etp_set_min_parallel (unsigned int nthreads)
752{
753 if (wanted < nthreads)
754 wanted = nthreads;
755}
756
757static void ecb_cold
758etp_set_max_parallel (unsigned int nthreads)
759{
760 if (wanted > nthreads)
761 wanted = nthreads;
762
763 while (started > wanted)
764 etp_end_thread ();
765}
766 393
767/*****************************************************************************/ 394/*****************************************************************************/
768 395
769static void 396static void
770grp_try_feed (eio_req *grp) 397grp_try_feed (eio_req *grp)
771{ 398{
772 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 399 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
773 { 400 {
774 grp->flags &= ~EIO_FLAG_GROUPADD; 401 grp->flags &= ~ETP_FLAG_GROUPADD;
775 402
776 EIO_FEED (grp); 403 EIO_FEED (grp);
777 404
778 /* stop if no progress has been made */ 405 /* stop if no progress has been made */
779 if (!(grp->flags & EIO_FLAG_GROUPADD)) 406 if (!(grp->flags & ETP_FLAG_GROUPADD))
780 { 407 {
781 grp->feed = 0; 408 grp->feed = 0;
782 break; 409 break;
783 } 410 }
784 } 411 }
791 418
792 /* call feeder, if applicable */ 419 /* call feeder, if applicable */
793 grp_try_feed (grp); 420 grp_try_feed (grp);
794 421
795 /* finish, if done */ 422 /* finish, if done */
796 if (!grp->size && grp->int1) 423 if (!grp->size && grp->flags & ETP_FLAG_DELAYED)
797 return eio_finish (grp); 424 return eio_finish (grp);
798 else 425 else
799 return 0; 426 return 0;
800} 427}
801 428
837} 464}
838 465
839void 466void
840eio_grp_cancel (eio_req *grp) 467eio_grp_cancel (eio_req *grp)
841{ 468{
842 for (grp = grp->grp_first; grp; grp = grp->grp_next) 469 etp_grp_cancel (EIO_POOL, grp);
843 eio_cancel (grp);
844} 470}
845 471
846void 472void
847eio_cancel (eio_req *req) 473eio_cancel (eio_req *req)
848{ 474{
849 etp_cancel (req); 475 etp_cancel (EIO_POOL, req);
850} 476}
851 477
852void 478void
853eio_submit (eio_req *req) 479eio_submit (eio_req *req)
854{ 480{
855 etp_submit (req); 481 etp_submit (EIO_POOL, req);
856} 482}
857 483
858unsigned int 484unsigned int
859eio_nreqs (void) 485eio_nreqs (void)
860{ 486{
861 return etp_nreqs (); 487 return etp_nreqs (EIO_POOL);
862} 488}
863 489
864unsigned int 490unsigned int
865eio_nready (void) 491eio_nready (void)
866{ 492{
867 return etp_nready (); 493 return etp_nready (EIO_POOL);
868} 494}
869 495
870unsigned int 496unsigned int
871eio_npending (void) 497eio_npending (void)
872{ 498{
873 return etp_npending (); 499 return etp_npending (EIO_POOL);
874} 500}
875 501
876unsigned int ecb_cold 502unsigned int ecb_cold
877eio_nthreads (void) 503eio_nthreads (void)
878{ 504{
879 return etp_nthreads (); 505 return etp_nthreads (EIO_POOL);
880} 506}
881 507
882void ecb_cold 508void ecb_cold
883eio_set_max_poll_time (double nseconds) 509eio_set_max_poll_time (double nseconds)
884{ 510{
885 etp_set_max_poll_time (nseconds); 511 etp_set_max_poll_time (EIO_POOL, nseconds);
886} 512}
887 513
888void ecb_cold 514void ecb_cold
889eio_set_max_poll_reqs (unsigned int maxreqs) 515eio_set_max_poll_reqs (unsigned int maxreqs)
890{ 516{
891 etp_set_max_poll_reqs (maxreqs); 517 etp_set_max_poll_reqs (EIO_POOL, maxreqs);
892} 518}
893 519
894void ecb_cold 520void ecb_cold
895eio_set_max_idle (unsigned int nthreads) 521eio_set_max_idle (unsigned int nthreads)
896{ 522{
897 etp_set_max_idle (nthreads); 523 etp_set_max_idle (EIO_POOL, nthreads);
898} 524}
899 525
900void ecb_cold 526void ecb_cold
901eio_set_idle_timeout (unsigned int seconds) 527eio_set_idle_timeout (unsigned int seconds)
902{ 528{
903 etp_set_idle_timeout (seconds); 529 etp_set_idle_timeout (EIO_POOL, seconds);
904} 530}
905 531
906void ecb_cold 532void ecb_cold
907eio_set_min_parallel (unsigned int nthreads) 533eio_set_min_parallel (unsigned int nthreads)
908{ 534{
909 etp_set_min_parallel (nthreads); 535 etp_set_min_parallel (EIO_POOL, nthreads);
910} 536}
911 537
912void ecb_cold 538void ecb_cold
913eio_set_max_parallel (unsigned int nthreads) 539eio_set_max_parallel (unsigned int nthreads)
914{ 540{
915 etp_set_max_parallel (nthreads); 541 etp_set_max_parallel (EIO_POOL, nthreads);
916} 542}
917 543
918int eio_poll (void) 544int eio_poll (void)
919{ 545{
920 return etp_poll (); 546 return etp_poll (EIO_POOL);
921} 547}
922 548
923/*****************************************************************************/ 549/*****************************************************************************/
924/* work around various missing functions */ 550/* work around various missing functions */
925
926#if !HAVE_PREADWRITE
927# undef pread
928# undef pwrite
929# define pread eio__pread
930# define pwrite eio__pwrite
931
932static eio_ssize_t
933eio__pread (int fd, void *buf, size_t count, off_t offset)
934{
935 eio_ssize_t res;
936 off_t ooffset;
937
938 X_LOCK (preadwritelock);
939 ooffset = lseek (fd, 0, SEEK_CUR);
940 lseek (fd, offset, SEEK_SET);
941 res = read (fd, buf, count);
942 lseek (fd, ooffset, SEEK_SET);
943 X_UNLOCK (preadwritelock);
944
945 return res;
946}
947
948static eio_ssize_t
949eio__pwrite (int fd, void *buf, size_t count, off_t offset)
950{
951 eio_ssize_t res;
952 off_t ooffset;
953
954 X_LOCK (preadwritelock);
955 ooffset = lseek (fd, 0, SEEK_CUR);
956 lseek (fd, offset, SEEK_SET);
957 res = write (fd, buf, count);
958 lseek (fd, ooffset, SEEK_SET);
959 X_UNLOCK (preadwritelock);
960
961 return res;
962}
963#endif
964 551
965#ifndef HAVE_UTIMES 552#ifndef HAVE_UTIMES
966 553
967# undef utimes 554# undef utimes
968# define utimes(path,times) eio__utimes (path, times) 555# define utimes(path,times) eio__utimes (path, times)
1010 int res; 597 int res;
1011 598
1012#if HAVE_SYS_SYNCFS 599#if HAVE_SYS_SYNCFS
1013 res = (int)syscall (__NR_syncfs, (int)(fd)); 600 res = (int)syscall (__NR_syncfs, (int)(fd));
1014#else 601#else
1015 res = -1; 602 res = EIO_ENOSYS ();
1016 errno = ENOSYS;
1017#endif 603#endif
1018 604
1019 if (res < 0 && errno == ENOSYS && fd >= 0) 605 if (res < 0 && errno == ENOSYS && fd >= 0)
1020 sync (); 606 sync ();
1021 607
1051} 637}
1052 638
1053static int 639static int
1054eio__fallocate (int fd, int mode, off_t offset, size_t len) 640eio__fallocate (int fd, int mode, off_t offset, size_t len)
1055{ 641{
1056#if HAVE_FALLOCATE 642#if HAVE_LINUX_FALLOCATE
1057 return fallocate (fd, mode, offset, len); 643 return fallocate (fd, mode, offset, len);
1058#else 644#else
1059 errno = ENOSYS; 645 return EIO_ENOSYS ();
1060 return -1;
1061#endif 646#endif
1062} 647}
1063 648
1064#if !HAVE_READAHEAD 649#if !HAVE_READAHEAD
1065# undef readahead 650# undef readahead
1080 todo -= len; 665 todo -= len;
1081 } 666 }
1082 667
1083 FUBd; 668 FUBd;
1084 669
1085 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 */
1086 return count; 672 return 0;
1087} 673}
1088 674
1089#endif 675#endif
1090 676
1091/* sendfile always needs emulation */ 677/* sendfile always needs emulation */
1126 712
1127 /* according to source inspection, this is correct, and useful behaviour */ 713 /* according to source inspection, this is correct, and useful behaviour */
1128 if (sbytes) 714 if (sbytes)
1129 res = sbytes; 715 res = sbytes;
1130 716
1131# elif defined (__APPLE__) 717# elif defined __APPLE__
1132 off_t sbytes = count; 718 off_t sbytes = count;
1133 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 719 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1134 720
1135 /* according to the manpage, sbytes is always valid */ 721 /* according to the manpage, sbytes is always valid */
1136 if (sbytes) 722 if (sbytes)
1163 HANDLE h = TO_SOCKET (ifd); 749 HANDLE h = TO_SOCKET (ifd);
1164 SetFilePointer (h, offset, 0, FILE_BEGIN); 750 SetFilePointer (h, offset, 0, FILE_BEGIN);
1165 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0); 751 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1166 752
1167#else 753#else
1168 res = -1; 754 res = EIO_ENOSYS ();
1169 errno = ENOSYS;
1170#endif 755#endif
1171 756
1172 /* we assume sendfile can copy at least 128mb in one go */ 757 /* we assume sendfile can copy at least 128mb in one go */
1173 if (res <= 128 * 1024 * 1024) 758 if (res <= 128 * 1024 * 1024)
1174 { 759 {
1360} 945}
1361 946
1362/*****************************************************************************/ 947/*****************************************************************************/
1363/* requests implemented outside eio_execute, because they are so large */ 948/* requests implemented outside eio_execute, because they are so large */
1364 949
1365/* copies some absolute path to tmpbuf */ 950static void
1366static char * 951eio__lseek (eio_req *req)
1367eio__getwd (struct tmpbuf *tmpbuf, eio_wd wd)
1368{ 952{
1369 if (wd == EIO_CWD) 953 /* this usually gets optimised away completely, or your compiler sucks, */
1370 return getcwd (tmpbuf->ptr, PATH_MAX); 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;
1371 959
1372#if HAVE_AT 960 req->offs = lseek (req->int1, req->offs, whence);
1373 abort (); /*TODO*/ 961 req->result = req->offs == (off_t)-1 ? -1 : 0;
1374#else
1375 strcpy (tmpbuf->ptr, wd);
1376#endif
1377 return tmpbuf->ptr;
1378} 962}
1379 963
1380/* result will always end up in tmpbuf, there is always space for adding a 0-byte */ 964/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
1381static int 965static int
1382eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path) 966eio__realpath (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
1383{ 967{
968 char *res;
1384 const char *rel = path; 969 const char *rel = path;
1385 char *res;
1386 char *tmp1, *tmp2; 970 char *tmp1, *tmp2;
1387#if SYMLOOP_MAX > 32 971#if SYMLOOP_MAX > 32
1388 int symlinks = SYMLOOP_MAX; 972 int symlinks = SYMLOOP_MAX;
1389#else 973#else
1390 int symlinks = 32; 974 int symlinks = 32;
1391#endif 975#endif
1392 976
1393 /*D*/ /*TODO: wd ignored */
1394
1395 errno = EINVAL; 977 errno = EINVAL;
1396 if (!rel) 978 if (!rel)
1397 return -1; 979 return -1;
1398 980
1399 errno = ENOENT; 981 errno = ENOENT;
1400 if (!*rel) 982 if (!*rel)
1401 return -1; 983 return -1;
1402 984
1403 res = tmpbuf_get (tmpbuf, PATH_MAX * 3); 985 res = etp_tmpbuf_get (tmpbuf, EIO_PATH_MAX * 3);
986#ifdef _WIN32
987 if (_access (rel, 4) != 0)
988 return -1;
989
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
1404 tmp1 = res + PATH_MAX; 1003 tmp1 = res + EIO_PATH_MAX;
1405 tmp2 = tmp1 + PATH_MAX; 1004 tmp2 = tmp1 + EIO_PATH_MAX;
1406 1005
1407#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 */
1408#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1007#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1409 /* on linux we may be able to ask the kernel */ 1008 /* on linux we may be able to ask the kernel */
1410 { 1009 {
1411 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);
1412 1011
1413 if (fd >= 0) 1012 if (fd >= 0)
1414 { 1013 {
1415 sprintf (tmp1, "/proc/self/fd/%d", fd); 1014 sprintf (tmp1, "/proc/self/fd/%d", fd);
1416 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 */
1417 close (fd); 1017 close (fd);
1418
1419 /* here we should probably stat the open file and the disk file, to make sure they still match */
1420 1018
1421 if (req->result > 0) 1019 if (req->result > 0)
1422 goto done; 1020 goto done;
1423 } 1021 }
1424 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)
1425 return; 1023 return -1;
1426 } 1024 }
1427#endif 1025#endif
1428#endif 1026#endif
1429 1027
1430 if (*rel != '/') 1028 if (*rel != '/')
1431 { 1029 {
1432 if (!eio__getwd (tmpbuf, wd)) 1030 int len;
1031
1032 errno = ENOENT;
1033 if (wd == EIO_INVALID_WD)
1433 return -1; 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);
1434 1045
1435 if (res [1]) /* only use if not / */ 1046 if (res [1]) /* only use if not / */
1436 res += strlen (res); 1047 res += len;
1437 } 1048 }
1438 1049
1439 while (*rel) 1050 while (*rel)
1440 { 1051 {
1441 eio_ssize_t len, linklen; 1052 eio_ssize_t len, linklen;
1469 } 1080 }
1470 } 1081 }
1471 1082
1472 errno = ENAMETOOLONG; 1083 errno = ENAMETOOLONG;
1473 if (res + 1 + len + 1 >= tmp1) 1084 if (res + 1 + len + 1 >= tmp1)
1474 return; 1085 return -1;
1475 1086
1476 /* copy one component */ 1087 /* copy one component */
1477 *res = '/'; 1088 *res = '/';
1478 memcpy (res + 1, beg, len); 1089 memcpy (res + 1, beg, len);
1479 1090
1480 /* zero-terminate, for readlink */ 1091 /* zero-terminate, for readlink */
1481 res [len + 1] = 0; 1092 res [len + 1] = 0;
1482 1093
1483 /* now check if it's a symlink */ 1094 /* now check if it's a symlink */
1484 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX); 1095 linklen = readlink (tmpbuf->ptr, tmp1, EIO_PATH_MAX);
1485 1096
1486 if (linklen < 0) 1097 if (linklen < 0)
1487 { 1098 {
1488 if (errno != EINVAL) 1099 if (errno != EINVAL)
1489 return -1; 1100 return -1;
1495 { 1106 {
1496 /* yay, it was a symlink - build new path in tmp2 */ 1107 /* yay, it was a symlink - build new path in tmp2 */
1497 int rellen = strlen (rel); 1108 int rellen = strlen (rel);
1498 1109
1499 errno = ENAMETOOLONG; 1110 errno = ENAMETOOLONG;
1500 if (linklen + 1 + rellen >= PATH_MAX) 1111 if (linklen + 1 + rellen >= EIO_PATH_MAX) /* also catch linklen >= EIO_PATH_MAX */
1501 return -1; 1112 return -1;
1502 1113
1503 errno = ELOOP; 1114 errno = ELOOP;
1504 if (!--symlinks) 1115 if (!--symlinks)
1505 return -1; 1116 return -1;
1519 /* special case for the lone root path */ 1130 /* special case for the lone root path */
1520 if (res == tmpbuf->ptr) 1131 if (res == tmpbuf->ptr)
1521 *res++ = '/'; 1132 *res++ = '/';
1522 1133
1523 return res - (char *)tmpbuf->ptr; 1134 return res - (char *)tmpbuf->ptr;
1135#endif
1524} 1136}
1525 1137
1526static signed char 1138static signed char
1527eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1139eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1528{ 1140{
1688 eio_dent_insertion_sort (dents, size); 1300 eio_dent_insertion_sort (dents, size);
1689} 1301}
1690 1302
1691/* read a full directory */ 1303/* read a full directory */
1692static void 1304static void
1693eio__scandir (eio_req *req) 1305eio__scandir (eio_req *req, etp_worker *self)
1694{ 1306{
1695 char *name, *names; 1307 char *name, *names;
1696 int namesalloc = 4096 - sizeof (void *) * 4; 1308 int namesalloc = 4096 - sizeof (void *) * 4;
1697 int namesoffs = 0; 1309 int namesoffs = 0;
1698 int flags = req->int1; 1310 int flags = req->int1;
1716#ifdef _WIN32 1328#ifdef _WIN32
1717 { 1329 {
1718 int len = strlen ((const char *)req->ptr1); 1330 int len = strlen ((const char *)req->ptr1);
1719 char *path = malloc (MAX_PATH); 1331 char *path = malloc (MAX_PATH);
1720 const char *fmt; 1332 const char *fmt;
1333 const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1721 1334
1722 if (!len) 1335 if (!len)
1723 fmt = "./*"; 1336 fmt = "./*";
1724 else if (((const char *)req->ptr1)[len - 1] == '/' || ((const char *)req->ptr1)[len - 1] == '\\') 1337 else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1725 fmt = "%s*"; 1338 fmt = "%s*";
1726 else 1339 else
1727 fmt = "%s/*"; 1340 fmt = "%s/*";
1728 1341
1729 _snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1); 1342 _snprintf (path, MAX_PATH, fmt, reqpath);
1730 dirp = FindFirstFile (path, &entp); 1343 dirp = FindFirstFile (path, &entp);
1731 free (path); 1344 free (path);
1732 1345
1733 if (dirp == INVALID_HANDLE_VALUE) 1346 if (dirp == INVALID_HANDLE_VALUE)
1734 { 1347 {
1756 1369
1757 return; 1370 return;
1758 } 1371 }
1759 } 1372 }
1760#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
1761 dirp = opendir (req->ptr1); 1388 dirp = opendir (req->ptr1);
1389 #else
1390 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
1391 #endif
1762 1392
1763 if (!dirp) 1393 if (!dirp)
1764 return; 1394 return;
1765#endif 1395#endif
1766 1396
1883 #ifdef DT_FIFO 1513 #ifdef DT_FIFO
1884 case DT_FIFO: ent->type = EIO_DT_FIFO; break; 1514 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1885 #endif 1515 #endif
1886 #ifdef DT_CHR 1516 #ifdef DT_CHR
1887 case DT_CHR: ent->type = EIO_DT_CHR; break; 1517 case DT_CHR: ent->type = EIO_DT_CHR; break;
1888 #endif 1518 #endif
1889 #ifdef DT_MPC 1519 #ifdef DT_MPC
1890 case DT_MPC: ent->type = EIO_DT_MPC; break; 1520 case DT_MPC: ent->type = EIO_DT_MPC; break;
1891 #endif 1521 #endif
1892 #ifdef DT_DIR 1522 #ifdef DT_DIR
1893 case DT_DIR: ent->type = EIO_DT_DIR; break; 1523 case DT_DIR: ent->type = EIO_DT_DIR; break;
1894 #endif 1524 #endif
1895 #ifdef DT_NAM 1525 #ifdef DT_NAM
1896 case DT_NAM: ent->type = EIO_DT_NAM; break; 1526 case DT_NAM: ent->type = EIO_DT_NAM; break;
1897 #endif 1527 #endif
1898 #ifdef DT_BLK 1528 #ifdef DT_BLK
1899 case DT_BLK: ent->type = EIO_DT_BLK; break; 1529 case DT_BLK: ent->type = EIO_DT_BLK; break;
1900 #endif 1530 #endif
1901 #ifdef DT_MPB 1531 #ifdef DT_MPB
1902 case DT_MPB: ent->type = EIO_DT_MPB; break; 1532 case DT_MPB: ent->type = EIO_DT_MPB; break;
1903 #endif 1533 #endif
1904 #ifdef DT_REG 1534 #ifdef DT_REG
1905 case DT_REG: ent->type = EIO_DT_REG; break; 1535 case DT_REG: ent->type = EIO_DT_REG; break;
1906 #endif 1536 #endif
1907 #ifdef DT_NWK 1537 #ifdef DT_NWK
1908 case DT_NWK: ent->type = EIO_DT_NWK; break; 1538 case DT_NWK: ent->type = EIO_DT_NWK; break;
1909 #endif 1539 #endif
1910 #ifdef DT_CMP 1540 #ifdef DT_CMP
1911 case DT_CMP: ent->type = EIO_DT_CMP; break; 1541 case DT_CMP: ent->type = EIO_DT_CMP; break;
1912 #endif 1542 #endif
1913 #ifdef DT_LNK 1543 #ifdef DT_LNK
1914 case DT_LNK: ent->type = EIO_DT_LNK; break; 1544 case DT_LNK: ent->type = EIO_DT_LNK; break;
1915 #endif 1545 #endif
1916 #ifdef DT_SOCK 1546 #ifdef DT_SOCK
1917 case DT_SOCK: ent->type = EIO_DT_SOCK; break; 1547 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1930 { 1560 {
1931 if (ent->type == EIO_DT_UNKNOWN) 1561 if (ent->type == EIO_DT_UNKNOWN)
1932 { 1562 {
1933 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 */
1934 ent->score = 1; 1564 ent->score = 1;
1935 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */ 1565 else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1936 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 */
1937 } 1567 }
1938 else if (ent->type == EIO_DT_DIR) 1568 else if (ent->type == EIO_DT_DIR)
1939 ent->score = 0; 1569 ent->score = 0;
1940 } 1570 }
1960 } 1590 }
1961} 1591}
1962 1592
1963/*****************************************************************************/ 1593/*****************************************************************************/
1964/* working directory stuff */ 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;
1965 1637
1966#if HAVE_AT 1638#if HAVE_AT
1639 fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1967 1640
1968#define WD2FD(wd) ((wd) ? ((int)(long)(wd)) - 1 : AT_FDCWD) 1641 if (fd < 0)
1969 1642 return EIO_INVALID_WD;
1970#ifndef O_SEARCH
1971# define O_SEARCH O_RDONLY
1972#endif 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}
1973 1657
1974eio_wd 1658eio_wd
1975eio_wd_open_sync (eio_wd wd, const char *path) 1659eio_wd_open_sync (eio_wd wd, const char *path)
1976{ 1660{
1977 int fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY); 1661 struct etp_tmpbuf tmpbuf = { };
1978
1979 return fd >= 0 ? (eio_wd)(long)(fd + 1) : EIO_INVALID_WD;
1980}
1981
1982static eio_wd
1983eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
1984{
1985 return eio_wd_open_sync (wd, path); 1662 wd = eio__wd_open_sync (&tmpbuf, wd, path);
1663 free (tmpbuf.ptr);
1664
1665 return wd;
1986} 1666}
1987 1667
1988void 1668void
1989eio_wd_close_sync (eio_wd wd) 1669eio_wd_close_sync (eio_wd wd)
1990{ 1670{
1991 int fd = WD2FD (wd); 1671 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
1992 1672 {
1993 if (fd >= 0) 1673 #if HAVE_AT
1994 close (fd); 1674 close (wd->fd);
1675 #endif
1676 free (wd);
1677 }
1995} 1678}
1679
1680#if HAVE_AT
1681
1682/* they forgot these */
1996 1683
1997static int 1684static int
1998eio__truncateat (int dirfd, const char *path, off_t length) 1685eio__truncateat (int dirfd, const char *path, off_t length)
1999{ 1686{
2000 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC); 1687 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
2021 close (fd); 1708 close (fd);
2022 return res; 1709 return res;
2023 1710
2024} 1711}
2025 1712
2026#else
2027
2028/* on legacy systems, we represent the working directories simply by their path strings */
2029
2030static const char *
2031wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2032{
2033 if (!wd || *path == '/')
2034 return path;
2035
2036 {
2037 int l1 = strlen ((const char *)wd);
2038 int l2 = strlen (path);
2039
2040 char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2);
2041
2042 memcpy (res, wd, l1);
2043 res [l1] = '/';
2044 memcpy (res + l1 + 1, path, l2 + 1);
2045
2046 return res;
2047 }
2048}
2049
2050static eio_wd
2051eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2052{
2053 if (*path == '/') /* absolute paths ignore wd */
2054 path = strdup (path);
2055 else if (path [0] == '.' && !path [1]) /* special case '.', as it is common */
2056 return wd;
2057 else
2058 {
2059 int len = eio__realpath (tmpbuf, wd, path);
2060
2061 path = EIO_INVALID_WD;
2062
2063 if (len >= 0)
2064 {
2065 ((char *)tmpbuf->ptr)[len] = 0;
2066 path = strdup (tmpbuf->ptr);
2067 }
2068 }
2069
2070 if (!path)
2071 path = EIO_INVALID_WD;
2072
2073 return (eio_wd)path;
2074}
2075
2076eio_wd
2077eio_wd_open_sync (eio_wd wd, const char *path)
2078{
2079 struct tmpbuf tmpbuf = { 0 };
2080 wd = eio__wd_open_sync (&tmpbuf, wd, path);
2081 free (tmpbuf.ptr);
2082
2083 return wd;
2084}
2085
2086void
2087eio_wd_close_sync (eio_wd wd)
2088{
2089 if (wd != EIO_INVALID_WD)
2090 free (wd);
2091}
2092
2093#endif 1713#endif
2094 1714
2095/*****************************************************************************/ 1715/*****************************************************************************/
2096 1716
2097#define ALLOC(len) \ 1717#define ALLOC(len) \
2098 if (!req->ptr2) \ 1718 if (!req->ptr2) \
2099 { \ 1719 { \
2100 X_LOCK (wrklock); \ 1720 X_LOCK (EIO_POOL->wrklock); \
2101 req->flags |= EIO_FLAG_PTR2_FREE; \ 1721 req->flags |= EIO_FLAG_PTR2_FREE; \
2102 X_UNLOCK (wrklock); \ 1722 X_UNLOCK (EIO_POOL->wrklock); \
2103 req->ptr2 = malloc (len); \ 1723 req->ptr2 = malloc (len); \
2104 if (!req->ptr2) \ 1724 if (!req->ptr2) \
2105 { \ 1725 { \
2106 errno = ENOMEM; \ 1726 errno = ENOMEM; \
2107 req->result = -1; \ 1727 req->result = -1; \
2108 break; \ 1728 break; \
2109 } \ 1729 } \
2110 } 1730 }
2111 1731
2112X_THREAD_PROC (etp_proc)
2113{
2114 ETP_REQ *req;
2115 struct timespec ts;
2116 etp_worker *self = (etp_worker *)thr_arg;
2117
2118#if HAVE_PRCTL_SET_NAME
2119 prctl (PR_SET_NAME, (unsigned long)"eio_thread", 0, 0, 0);
2120#endif
2121
2122 /* try to distribute timeouts somewhat evenly */
2123 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
2124
2125 for (;;)
2126 {
2127 ts.tv_sec = 0;
2128
2129 X_LOCK (reqlock);
2130
2131 for (;;)
2132 {
2133 req = reqq_shift (&req_queue);
2134
2135 if (req)
2136 break;
2137
2138 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
2139 {
2140 X_UNLOCK (reqlock);
2141 X_LOCK (wrklock);
2142 --started;
2143 X_UNLOCK (wrklock);
2144 goto quit;
2145 }
2146
2147 ++idle;
2148
2149 if (idle <= max_idle)
2150 /* we are allowed to idle, so do so without any timeout */
2151 X_COND_WAIT (reqwait, reqlock);
2152 else
2153 {
2154 /* initialise timeout once */
2155 if (!ts.tv_sec)
2156 ts.tv_sec = time (0) + idle_timeout;
2157
2158 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
2159 ts.tv_sec = 1; /* assuming this is not a value computed above.,.. */
2160 }
2161
2162 --idle;
2163 }
2164
2165 --nready;
2166
2167 X_UNLOCK (reqlock);
2168
2169 if (req->type < 0)
2170 goto quit;
2171
2172 ETP_EXECUTE (self, req);
2173
2174 X_LOCK (reslock);
2175
2176 ++npending;
2177
2178 if (!reqq_push (&res_queue, req) && want_poll_cb)
2179 want_poll_cb ();
2180
2181 etp_worker_clear (self);
2182
2183 X_UNLOCK (reslock);
2184 }
2185
2186quit:
2187 free (req);
2188
2189 X_LOCK (wrklock);
2190 etp_worker_free (self);
2191 X_UNLOCK (wrklock);
2192
2193 return 0;
2194}
2195
2196/*****************************************************************************/ 1732/*****************************************************************************/
2197 1733
2198int ecb_cold 1734int ecb_cold
2199eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1735eio_init (void (*want_poll)(void), void (*done_poll)(void))
2200{ 1736{
2201#if !HAVE_PREADWRITE 1737 eio_want_poll_cb = want_poll;
2202 X_MUTEX_CREATE (preadwritelock); 1738 eio_done_poll_cb = done_poll;
2203#endif
2204 1739
2205 return etp_init (want_poll, done_poll); 1740 return etp_init (EIO_POOL, 0, 0, 0);
2206} 1741}
2207 1742
2208ecb_inline void 1743ecb_inline void
2209eio_api_destroy (eio_req *req) 1744eio_api_destroy (eio_req *req)
2210{ 1745{
2211 free (req); 1746 free (req);
2212} 1747}
2213 1748
2214#define REQ(rtype) \ 1749#define REQ(rtype) \
2215 eio_req *req; \ 1750 eio_req *req; \
2216 \ 1751 \
2217 req = (eio_req *)calloc (1, sizeof *req); \ 1752 req = (eio_req *)calloc (1, sizeof *req); \
2218 if (!req) \ 1753 if (!req) \
2219 return 0; \ 1754 return 0; \
2233 { \ 1768 { \
2234 eio_api_destroy (req); \ 1769 eio_api_destroy (req); \
2235 return 0; \ 1770 return 0; \
2236 } 1771 }
2237 1772
1773#define SINGLEDOT(ptr) (0[(char *)(ptr)] == '.' && !1[(char *)(ptr)])
1774
2238static void 1775static void
2239eio_execute (etp_worker *self, eio_req *req) 1776eio_execute (etp_worker *self, eio_req *req)
2240{ 1777{
2241#if HAVE_AT 1778#if HAVE_AT
2242 int dirfd; 1779 int dirfd;
2270 switch (req->type) 1807 switch (req->type)
2271 { 1808 {
2272 case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1); 1809 case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
2273 req->result = req->wd == EIO_INVALID_WD ? -1 : 0; 1810 req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
2274 break; 1811 break;
1812 case EIO_WD_CLOSE: req->result = 0;
1813 eio_wd_close_sync (req->wd); break;
1814
2275 case EIO_WD_CLOSE: eio_wd_close_sync (req->wd); break; 1815 case EIO_SEEK: eio__lseek (req); break;
2276
2277 case EIO_READ: ALLOC (req->size); 1816 case EIO_READ: ALLOC (req->size);
2278 req->result = req->offs >= 0 1817 req->result = req->offs >= 0
2279 ? pread (req->int1, req->ptr2, req->size, req->offs) 1818 ? pread (req->int1, req->ptr2, req->size, req->offs)
2280 : read (req->int1, req->ptr2, req->size); break; 1819 : read (req->int1, req->ptr2, req->size); break;
2281 case EIO_WRITE: req->result = req->offs >= 0 1820 case EIO_WRITE: req->result = req->offs >= 0
2282 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 1821 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
2283 : write (req->int1, req->ptr2, req->size); break; 1822 : write (req->int1, req->ptr2, req->size); break;
2284 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
2285 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;
2286 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;
2287 1829
2288#if HAVE_AT 1830#if HAVE_AT
1831
2289 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1832 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2290 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break; 1833 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
2291 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1834 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2292 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break; 1835 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
2293 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break; 1836 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
2294 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break; 1837 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
2295 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break; 1838 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
2296 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break; 1839 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
2297 1840
2298 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break; 1841 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
2299 case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); 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;
2300 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break; 1846 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
2301 case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD (req->int3), req->ptr2); 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;
2302 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD (req->int3), req->ptr2, 0); break; 1851 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
2303 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break; 1852 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
2304 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break; 1853 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2305 case EIO_READLINK: ALLOC (PATH_MAX);
2306 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
2307 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 1854 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2308 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 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
2309#else 1888#else
1889
2310 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1890 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2311 req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break; 1891 req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2312 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1892 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2313 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break; 1893 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2314 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break; 1894 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
2321 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break; 1901 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
2322 case EIO_RENAME: req->result = rename (path , req->ptr2); break; 1902 case EIO_RENAME: req->result = rename (path , req->ptr2); break;
2323 case EIO_LINK: req->result = link (path , req->ptr2); break; 1903 case EIO_LINK: req->result = link (path , req->ptr2); break;
2324 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break; 1904 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
2325 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break; 1905 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
2326 case EIO_READLINK: ALLOC (PATH_MAX);
2327 req->result = readlink (path, req->ptr2, PATH_MAX); break;
2328 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 1906 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2329 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break; 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
2330#endif 1941#endif
2331 1942
2332 case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1))) 1943 case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
2333 { 1944 {
2334 ALLOC (req->result); 1945 ALLOC (req->result);
2357 case EIO_MTOUCH: req->result = eio__mtouch (req); break; 1968 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2358 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break; 1969 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2359 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 1970 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2360 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break; 1971 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2361 1972
2362 case EIO_READDIR: eio__scandir (req); break; 1973 case EIO_READDIR: eio__scandir (req, self); break;
2363 1974
2364 case EIO_BUSY: 1975 case EIO_BUSY:
2365#ifdef _WIN32 1976#ifdef _WIN32
2366 Sleep (req->nv1 * 1e3); 1977 Sleep (req->nv1 * 1e3);
2367#else 1978#else
2374 req->result = select (0, 0, 0, 0, &tv); 1985 req->result = select (0, 0, 0, 0, &tv);
2375 } 1986 }
2376#endif 1987#endif
2377 break; 1988 break;
2378 1989
2379 case EIO_UTIME: 1990#if 0
2380 case EIO_FUTIME:
2381 {
2382 struct timeval tv[2];
2383 struct timeval *times;
2384
2385 if (req->nv1 != -1. || req->nv2 != -1.)
2386 {
2387 tv[0].tv_sec = req->nv1;
2388 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
2389 tv[1].tv_sec = req->nv2;
2390 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
2391
2392 times = tv;
2393 }
2394 else
2395 times = 0;
2396
2397 req->result = req->type == EIO_FUTIME
2398 ? futimes (req->int1, times)
2399 : utimes (req->ptr1, times);
2400 }
2401 break;
2402
2403 case EIO_GROUP: 1991 case EIO_GROUP:
2404 abort (); /* handled in eio_request */ 1992 abort (); /* handled in eio_request */
1993#endif
2405 1994
2406 case EIO_NOP: 1995 case EIO_NOP:
2407 req->result = 0; 1996 req->result = 0;
2408 break; 1997 break;
2409 1998
2410 case EIO_CUSTOM: 1999 case EIO_CUSTOM:
2411 req->feed (req); 2000 req->feed (req);
2412 break; 2001 break;
2413 2002
2414 default: 2003 default:
2415 errno = ENOSYS;
2416 req->result = -1; 2004 req->result = EIO_ENOSYS ();
2417 break; 2005 break;
2418 } 2006 }
2419 2007
2420 req->errorno = errno; 2008 req->errorno = errno;
2421} 2009}
2422 2010
2423#ifndef EIO_NO_WRAPPERS 2011#ifndef EIO_NO_WRAPPERS
2424 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
2425eio_req *eio_nop (int pri, eio_cb cb, void *data) 2023eio_req *eio_nop (int pri, eio_cb cb, void *data)
2426{ 2024{
2427 REQ (EIO_NOP); SEND; 2025 REQ (EIO_NOP); SEND;
2428} 2026}
2429 2027
2490eio_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)
2491{ 2089{
2492 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;
2493} 2091}
2494 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
2495eio_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)
2496{ 2099{
2497 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;
2498} 2101}
2499 2102
2500eio_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)
2501{ 2104{
2502 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;
2503} 2116}
2504 2117
2505eio_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)
2506{ 2119{
2507 REQ (EIO_FSTAT); req->int1 = fd; SEND; 2120 REQ (EIO_FSTAT); req->int1 = fd; SEND;
2695void 2308void
2696eio_grp_add (eio_req *grp, eio_req *req) 2309eio_grp_add (eio_req *grp, eio_req *req)
2697{ 2310{
2698 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));
2699 2312
2700 grp->flags |= EIO_FLAG_GROUPADD; 2313 grp->flags |= ETP_FLAG_GROUPADD;
2701 2314
2702 ++grp->size; 2315 ++grp->size;
2703 req->grp = grp; 2316 req->grp = grp;
2704 2317
2705 req->grp_prev = 0; 2318 req->grp_prev = 0;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines