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

Comparing libeio/eio.c (file contents):
Revision 1.106 by root, Mon Sep 26 20:19:08 2011 UTC vs.
Revision 1.150 by root, Fri Jun 15 02:57:36 2018 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,2017 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>
58#include <sys/stat.h> 53#include <sys/stat.h>
59#include <limits.h> 54#include <limits.h>
60#include <fcntl.h> 55#include <fcntl.h>
61#include <assert.h> 56#include <assert.h>
62 57
63#if _POSIX_VERSION >= 200809L
64# define HAVE_AT 1
65#else
66# define HAVE_AT 0
67#endif
68
69/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */ 58/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */
70/* intptr_t only comes from stdint.h, says idiot openbsd coder */ 59/* intptr_t only comes from stdint.h, says idiot openbsd coder */
71#if HAVE_STDINT_H 60#if HAVE_STDINT_H
72# include <stdint.h> 61# include <stdint.h>
73#endif 62#endif
126 #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))
127 116
128 #define chmod(path,mode) _chmod (path, mode) 117 #define chmod(path,mode) _chmod (path, mode)
129 #define dup(fd) _dup (fd) 118 #define dup(fd) _dup (fd)
130 #define dup2(fd1,fd2) _dup2 (fd1, fd2) 119 #define dup2(fd1,fd2) _dup2 (fd1, fd2)
120 #define pipe(fds) _pipe (fds, 4096, O_BINARY)
131 121
122 #define fcntl(fd,cmd,arg) EIO_ENOSYS ()
123 #define ioctl(fd,cmd,arg) EIO_ENOSYS ()
132 #define fchmod(fd,mode) EIO_ENOSYS () 124 #define fchmod(fd,mode) EIO_ENOSYS ()
133 #define chown(path,uid,gid) EIO_ENOSYS () 125 #define chown(path,uid,gid) EIO_ENOSYS ()
134 #define fchown(fd,uid,gid) EIO_ENOSYS () 126 #define fchown(fd,uid,gid) EIO_ENOSYS ()
135 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */ 127 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
136 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */ 128 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
137 #define mknod(path,mode,dev) EIO_ENOSYS () 129 #define mknod(path,mode,dev) EIO_ENOSYS ()
138 #define sync() EIO_ENOSYS () 130 #define sync() EIO_ENOSYS ()
139 #define readlink(path,buf,s) EIO_ENOSYS () 131 #define readlink(path,buf,s) EIO_ENOSYS ()
140 #define statvfs(path,buf) EIO_ENOSYS () 132 #define statvfs(path,buf) EIO_ENOSYS ()
141 #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 }
142 169
143 /* rename() uses MoveFile, which fails to overwrite */ 170 /* rename() uses MoveFile, which fails to overwrite */
144 #define rename(old,neu) eio__rename (old, neu) 171 #define rename(old,neu) eio__rename (old, neu)
145 172
146 static int 173 static int
174 /* we could even stat and see if it exists */ 201 /* we could even stat and see if it exists */
175 static int 202 static int
176 symlink (const char *old, const char *neu) 203 symlink (const char *old, const char *neu)
177 { 204 {
178 #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)
179 if (CreateSymbolicLink (neu, old, 1)) 213 if (CreateSymbolicLink (neu, old, flags))
180 return 0; 214 return 0;
181
182 if (CreateSymbolicLink (neu, old, 0))
183 return 0;
184 #endif 215 #endif
185 216
186 return EIO_ERRNO (ENOENT, -1); 217 return EIO_ERRNO (ENOENT, -1);
187 } 218 }
188 219
189 /* POSIX API only */ 220 /* POSIX API only, causing trouble for win32 apps */
190 #define CreateHardLink(neu,old,flags) 0 221 #define CreateHardLink(neu,old,flags) 0 /* not really creating hardlink, still using relative paths? */
191 #define CreateSymbolicLink(neu,old,flags) 0 222 #define CreateSymbolicLink(neu,old,flags) 0 /* vista+ only */
192 223
193 struct statvfs 224 struct statvfs
194 { 225 {
195 int dummy; 226 int dummy;
196 }; 227 };
200 #define D_NAME(entp) entp.cFileName 231 #define D_NAME(entp) entp.cFileName
201 #define D_TYPE(entp) (entp.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? DT_DIR : DT_REG) 232 #define D_TYPE(entp) (entp.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? DT_DIR : DT_REG)
202 233
203#else 234#else
204 235
236 #include <sys/ioctl.h>
205 #include <sys/time.h> 237 #include <sys/time.h>
206 #include <sys/select.h> 238 #include <sys/select.h>
207 #include <sys/statvfs.h>
208 #include <unistd.h> 239 #include <unistd.h>
209 #include <signal.h> 240 #include <signal.h>
210 #include <dirent.h> 241 #include <dirent.h>
211 242
243 #ifdef ANDROID
244 #include <sys/vfs.h>
245 #define statvfs statfs
246 #define fstatvfs fstatfs
247 #include <asm/page.h> /* supposedly limits.h does #define PAGESIZE PAGESIZE */
248 #else
249 #include <sys/statvfs.h>
250 #endif
251
212 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES 252 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
213 #include <sys/mman.h> 253 #include <sys/mman.h>
214 #endif 254 #endif
215 255
216 #define D_NAME(entp) entp->d_name 256 #define D_NAME(entp) entp->d_name
217 257
218 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */ 258 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
219 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 259 #if __FreeBSD__ || __NetBSD__ || __OpenBSD__
220 #define _DIRENT_HAVE_D_TYPE /* sigh */ 260 #define _DIRENT_HAVE_D_TYPE /* sigh */
221 #define D_INO(de) (de)->d_fileno 261 #define D_INO(de) (de)->d_fileno
222 #define D_NAMLEN(de) (de)->d_namlen 262 #define D_NAMLEN(de) (de)->d_namlen
223 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600 263 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
224 #define D_INO(de) (de)->d_ino 264 #define D_INO(de) (de)->d_ino
243# include <utime.h> 283# include <utime.h>
244#endif 284#endif
245 285
246#if HAVE_SYS_SYSCALL_H 286#if HAVE_SYS_SYSCALL_H
247# include <sys/syscall.h> 287# include <sys/syscall.h>
248#endif
249
250#if HAVE_SYS_PRCTL_H
251# include <sys/prctl.h>
252#endif 288#endif
253 289
254#if HAVE_SENDFILE 290#if HAVE_SENDFILE
255# if __linux 291# if __linux
256# include <sys/sendfile.h> 292# include <sys/sendfile.h>
264# else 300# else
265# error sendfile support requested but not available 301# error sendfile support requested but not available
266# endif 302# endif
267#endif 303#endif
268 304
305#if HAVE_RENAMEAT2
306# include <sys/syscall.h>
307# include <linux/fs.h>
308#endif
309
269#ifndef D_TYPE 310#ifndef D_TYPE
270# define D_TYPE(de) 0 311# define D_TYPE(de) 0
271#endif 312#endif
272#ifndef D_INO 313#ifndef D_INO
273# define D_INO(de) 0 314# define D_INO(de) 0
281# define NAME_MAX 4096 322# define NAME_MAX 4096
282#endif 323#endif
283 324
284/* used for readlink etc. */ 325/* used for readlink etc. */
285#ifndef PATH_MAX 326#ifndef PATH_MAX
286# define PATH_MAX 4096 327# define PATH_MAX 0
287#endif 328#endif
329
330#ifndef O_CLOEXEC
331 #define O_CLOEXEC 0
332#endif
333
334#ifndef EIO_PATH_MIN
335# define EIO_PATH_MIN 8160
336#endif
337
338#define EIO_PATH_MAX (PATH_MAX <= EIO_PATH_MIN ? EIO_PATH_MIN : PATH_MAX)
288 339
289/* buffer size for various temporary buffers */ 340/* buffer size for various temporary buffers */
290#define EIO_BUFSIZE 65536 341#define EIO_BUFSIZE 65536
291 342
292#define dBUF \ 343#define dBUF \
293 char *eio_buf = malloc (EIO_BUFSIZE); \ 344 char *eio_buf = malloc (EIO_BUFSIZE); \
294 errno = ENOMEM; \ 345 errno = ENOMEM; \
295 if (!eio_buf) \ 346 if (!eio_buf) \
296 return -1 347 return -1
297 348
298#define FUBd \ 349#define FUBd \
299 free (eio_buf) 350 free (eio_buf)
300 351
301#define EIO_TICKS ((1000000 + 1023) >> 10)
302
303/*****************************************************************************/ 352/*****************************************************************************/
304 353
305struct tmpbuf 354struct etp_tmpbuf;
355
356#if _POSIX_VERSION >= 200809L
357 #define HAVE_AT 1
358 #define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD)
359 #ifndef O_SEARCH
360 #define O_SEARCH O_RDONLY
361 #endif
362#else
363 #define HAVE_AT 0
364 static const char *wd_expand (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path);
365#endif
366
367struct eio_pwd
306{ 368{
307 void *ptr; 369#if HAVE_AT
370 int fd;
371#endif
308 int len; 372 int len;
373 char str[1]; /* actually, a 0-terminated canonical path */
309}; 374};
310
311static void *
312tmpbuf_get (struct tmpbuf *buf, int len)
313{
314 if (buf->len < len)
315 {
316 free (buf->ptr);
317 buf->ptr = malloc (buf->len = len);
318 }
319
320 return buf->ptr;
321}
322 375
323/*****************************************************************************/ 376/*****************************************************************************/
324 377
325#define ETP_PRI_MIN EIO_PRI_MIN 378#define ETP_PRI_MIN EIO_PRI_MIN
326#define ETP_PRI_MAX EIO_PRI_MAX 379#define ETP_PRI_MAX EIO_PRI_MAX
327 380
381#define ETP_TYPE_QUIT -1
382#define ETP_TYPE_GROUP EIO_GROUP
383
384static void eio_nop_callback (void) { }
385static void (*eio_want_poll_cb)(void) = eio_nop_callback;
386static void (*eio_done_poll_cb)(void) = eio_nop_callback;
387
388#define ETP_WANT_POLL(pool) eio_want_poll_cb ()
389#define ETP_DONE_POLL(pool) eio_done_poll_cb ()
390
328struct etp_worker; 391struct etp_worker;
329
330#define ETP_REQ eio_req 392#define ETP_REQ eio_req
331#define ETP_DESTROY(req) eio_destroy (req) 393#define ETP_DESTROY(req) eio_destroy (req)
332static int eio_finish (eio_req *req); 394static int eio_finish (eio_req *req);
333#define ETP_FINISH(req) eio_finish (req) 395#define ETP_FINISH(req) eio_finish (req)
334static void eio_execute (struct etp_worker *self, eio_req *req); 396static void eio_execute (struct etp_worker *self, eio_req *req);
335#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 397#define ETP_EXECUTE(wrk,req) eio_execute (wrk, req)
336 398
337/*****************************************************************************/ 399#include "etp.c"
338 400
339#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 401static struct etp_pool eio_pool;
340 402#define EIO_POOL (&eio_pool)
341/* calculate time difference in ~1/EIO_TICKS of a second */
342ecb_inline int
343tvdiff (struct timeval *tv1, struct timeval *tv2)
344{
345 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
346 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
347}
348
349static unsigned int started, idle, wanted = 4;
350
351static void (*want_poll_cb) (void);
352static void (*done_poll_cb) (void);
353
354static unsigned int max_poll_time; /* reslock */
355static unsigned int max_poll_reqs; /* reslock */
356
357static unsigned int nreqs; /* reqlock */
358static unsigned int nready; /* reqlock */
359static unsigned int npending; /* reqlock */
360static unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
361static unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
362
363static xmutex_t wrklock;
364static xmutex_t reslock;
365static xmutex_t reqlock;
366static xcond_t reqwait;
367
368#if !HAVE_PREADWRITE
369/*
370 * make our pread/pwrite emulation safe against themselves, but not against
371 * normal read/write by using a mutex. slows down execution a lot,
372 * but that's your problem, not mine.
373 */
374static xmutex_t preadwritelock;
375#endif
376
377typedef struct etp_worker
378{
379 struct tmpbuf tmpbuf;
380
381 /* locked by wrklock */
382 struct etp_worker *prev, *next;
383
384 xthread_t tid;
385
386#ifdef ETP_WORKER_COMMON
387 ETP_WORKER_COMMON
388#endif
389} etp_worker;
390
391static etp_worker wrk_first; /* NOT etp */
392
393#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
394#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
395
396/* worker threads management */
397
398static void ecb_cold
399etp_worker_clear (etp_worker *wrk)
400{
401}
402
403static void ecb_cold
404etp_worker_free (etp_worker *wrk)
405{
406 free (wrk->tmpbuf.ptr);
407
408 wrk->next->prev = wrk->prev;
409 wrk->prev->next = wrk->next;
410
411 free (wrk);
412}
413
414static unsigned int
415etp_nreqs (void)
416{
417 int retval;
418 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
419 retval = nreqs;
420 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
421 return retval;
422}
423
424static unsigned int
425etp_nready (void)
426{
427 unsigned int retval;
428
429 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
430 retval = nready;
431 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
432
433 return retval;
434}
435
436static unsigned int
437etp_npending (void)
438{
439 unsigned int retval;
440
441 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
442 retval = npending;
443 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
444
445 return retval;
446}
447
448static unsigned int
449etp_nthreads (void)
450{
451 unsigned int retval;
452
453 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
454 retval = started;
455 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
456
457 return retval;
458}
459
460/*
461 * a somewhat faster data structure might be nice, but
462 * with 8 priorities this actually needs <20 insns
463 * per shift, the most expensive operation.
464 */
465typedef struct {
466 ETP_REQ *qs[ETP_NUM_PRI], *qe[ETP_NUM_PRI]; /* qstart, qend */
467 int size;
468} etp_reqq;
469
470static etp_reqq req_queue;
471static etp_reqq res_queue;
472
473static void ecb_noinline ecb_cold
474reqq_init (etp_reqq *q)
475{
476 int pri;
477
478 for (pri = 0; pri < ETP_NUM_PRI; ++pri)
479 q->qs[pri] = q->qe[pri] = 0;
480
481 q->size = 0;
482}
483
484static int ecb_noinline
485reqq_push (etp_reqq *q, ETP_REQ *req)
486{
487 int pri = req->pri;
488 req->next = 0;
489
490 if (q->qe[pri])
491 {
492 q->qe[pri]->next = req;
493 q->qe[pri] = req;
494 }
495 else
496 q->qe[pri] = q->qs[pri] = req;
497
498 return q->size++;
499}
500
501static ETP_REQ * ecb_noinline
502reqq_shift (etp_reqq *q)
503{
504 int pri;
505
506 if (!q->size)
507 return 0;
508
509 --q->size;
510
511 for (pri = ETP_NUM_PRI; pri--; )
512 {
513 eio_req *req = q->qs[pri];
514
515 if (req)
516 {
517 if (!(q->qs[pri] = (eio_req *)req->next))
518 q->qe[pri] = 0;
519
520 return req;
521 }
522 }
523
524 abort ();
525}
526
527static int ecb_cold
528etp_init (void (*want_poll)(void), void (*done_poll)(void))
529{
530 X_MUTEX_CREATE (wrklock);
531 X_MUTEX_CREATE (reslock);
532 X_MUTEX_CREATE (reqlock);
533 X_COND_CREATE (reqwait);
534
535 reqq_init (&req_queue);
536 reqq_init (&res_queue);
537
538 wrk_first.next =
539 wrk_first.prev = &wrk_first;
540
541 started = 0;
542 idle = 0;
543 nreqs = 0;
544 nready = 0;
545 npending = 0;
546
547 want_poll_cb = want_poll;
548 done_poll_cb = done_poll;
549
550 return 0;
551}
552
553X_THREAD_PROC (etp_proc);
554
555static void ecb_cold
556etp_start_thread (void)
557{
558 etp_worker *wrk = calloc (1, sizeof (etp_worker));
559
560 /*TODO*/
561 assert (("unable to allocate worker thread data", wrk));
562
563 X_LOCK (wrklock);
564
565 if (thread_create (&wrk->tid, etp_proc, (void *)wrk))
566 {
567 wrk->prev = &wrk_first;
568 wrk->next = wrk_first.next;
569 wrk_first.next->prev = wrk;
570 wrk_first.next = wrk;
571 ++started;
572 }
573 else
574 free (wrk);
575
576 X_UNLOCK (wrklock);
577}
578
579static void
580etp_maybe_start_thread (void)
581{
582 if (ecb_expect_true (etp_nthreads () >= wanted))
583 return;
584
585 /* todo: maybe use idle here, but might be less exact */
586 if (ecb_expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
587 return;
588
589 etp_start_thread ();
590}
591
592static void ecb_cold
593etp_end_thread (void)
594{
595 eio_req *req = calloc (1, sizeof (eio_req)); /* will be freed by worker */
596
597 req->type = -1;
598 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
599
600 X_LOCK (reqlock);
601 reqq_push (&req_queue, req);
602 X_COND_SIGNAL (reqwait);
603 X_UNLOCK (reqlock);
604
605 X_LOCK (wrklock);
606 --started;
607 X_UNLOCK (wrklock);
608}
609
610static int
611etp_poll (void)
612{
613 unsigned int maxreqs;
614 unsigned int maxtime;
615 struct timeval tv_start, tv_now;
616
617 X_LOCK (reslock);
618 maxreqs = max_poll_reqs;
619 maxtime = max_poll_time;
620 X_UNLOCK (reslock);
621
622 if (maxtime)
623 gettimeofday (&tv_start, 0);
624
625 for (;;)
626 {
627 ETP_REQ *req;
628
629 etp_maybe_start_thread ();
630
631 X_LOCK (reslock);
632 req = reqq_shift (&res_queue);
633
634 if (req)
635 {
636 --npending;
637
638 if (!res_queue.size && done_poll_cb)
639 done_poll_cb ();
640 }
641
642 X_UNLOCK (reslock);
643
644 if (!req)
645 return 0;
646
647 X_LOCK (reqlock);
648 --nreqs;
649 X_UNLOCK (reqlock);
650
651 if (ecb_expect_false (req->type == EIO_GROUP && req->size))
652 {
653 req->int1 = 1; /* mark request as delayed */
654 continue;
655 }
656 else
657 {
658 int res = ETP_FINISH (req);
659 if (ecb_expect_false (res))
660 return res;
661 }
662
663 if (ecb_expect_false (maxreqs && !--maxreqs))
664 break;
665
666 if (maxtime)
667 {
668 gettimeofday (&tv_now, 0);
669
670 if (tvdiff (&tv_start, &tv_now) >= maxtime)
671 break;
672 }
673 }
674
675 errno = EAGAIN;
676 return -1;
677}
678
679static void
680etp_cancel (ETP_REQ *req)
681{
682 req->cancelled = 1;
683
684 eio_grp_cancel (req);
685}
686
687static void
688etp_submit (ETP_REQ *req)
689{
690 req->pri -= ETP_PRI_MIN;
691
692 if (ecb_expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
693 if (ecb_expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
694
695 if (ecb_expect_false (req->type == EIO_GROUP))
696 {
697 /* I hope this is worth it :/ */
698 X_LOCK (reqlock);
699 ++nreqs;
700 X_UNLOCK (reqlock);
701
702 X_LOCK (reslock);
703
704 ++npending;
705
706 if (!reqq_push (&res_queue, req) && want_poll_cb)
707 want_poll_cb ();
708
709 X_UNLOCK (reslock);
710 }
711 else
712 {
713 X_LOCK (reqlock);
714 ++nreqs;
715 ++nready;
716 reqq_push (&req_queue, req);
717 X_COND_SIGNAL (reqwait);
718 X_UNLOCK (reqlock);
719
720 etp_maybe_start_thread ();
721 }
722}
723
724static void ecb_cold
725etp_set_max_poll_time (double nseconds)
726{
727 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
728 max_poll_time = nseconds * EIO_TICKS;
729 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
730}
731
732static void ecb_cold
733etp_set_max_poll_reqs (unsigned int maxreqs)
734{
735 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
736 max_poll_reqs = maxreqs;
737 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
738}
739
740static void ecb_cold
741etp_set_max_idle (unsigned int nthreads)
742{
743 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
744 max_idle = nthreads;
745 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
746}
747
748static void ecb_cold
749etp_set_idle_timeout (unsigned int seconds)
750{
751 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
752 idle_timeout = seconds;
753 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
754}
755
756static void ecb_cold
757etp_set_min_parallel (unsigned int nthreads)
758{
759 if (wanted < nthreads)
760 wanted = nthreads;
761}
762
763static void ecb_cold
764etp_set_max_parallel (unsigned int nthreads)
765{
766 if (wanted > nthreads)
767 wanted = nthreads;
768
769 while (started > wanted)
770 etp_end_thread ();
771}
772 403
773/*****************************************************************************/ 404/*****************************************************************************/
774 405
775static void 406static void
776grp_try_feed (eio_req *grp) 407grp_try_feed (eio_req *grp)
777{ 408{
778 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 409 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
779 { 410 {
780 grp->flags &= ~EIO_FLAG_GROUPADD; 411 grp->flags &= ~ETP_FLAG_GROUPADD;
781 412
782 EIO_FEED (grp); 413 EIO_FEED (grp);
783 414
784 /* stop if no progress has been made */ 415 /* stop if no progress has been made */
785 if (!(grp->flags & EIO_FLAG_GROUPADD)) 416 if (!(grp->flags & ETP_FLAG_GROUPADD))
786 { 417 {
787 grp->feed = 0; 418 grp->feed = 0;
788 break; 419 break;
789 } 420 }
790 } 421 }
797 428
798 /* call feeder, if applicable */ 429 /* call feeder, if applicable */
799 grp_try_feed (grp); 430 grp_try_feed (grp);
800 431
801 /* finish, if done */ 432 /* finish, if done */
802 if (!grp->size && grp->int1) 433 if (!grp->size && grp->flags & ETP_FLAG_DELAYED)
803 return eio_finish (grp); 434 return eio_finish (grp);
804 else 435 else
805 return 0; 436 return 0;
806} 437}
807 438
843} 474}
844 475
845void 476void
846eio_grp_cancel (eio_req *grp) 477eio_grp_cancel (eio_req *grp)
847{ 478{
848 for (grp = grp->grp_first; grp; grp = grp->grp_next) 479 etp_grp_cancel (EIO_POOL, grp);
849 eio_cancel (grp);
850} 480}
851 481
852void 482void
853eio_cancel (eio_req *req) 483eio_cancel (eio_req *req)
854{ 484{
855 etp_cancel (req); 485 etp_cancel (EIO_POOL, req);
856} 486}
857 487
858void 488void
859eio_submit (eio_req *req) 489eio_submit (eio_req *req)
860{ 490{
861 etp_submit (req); 491 etp_submit (EIO_POOL, req);
862} 492}
863 493
864unsigned int 494unsigned int
865eio_nreqs (void) 495eio_nreqs (void)
866{ 496{
867 return etp_nreqs (); 497 return etp_nreqs (EIO_POOL);
868} 498}
869 499
870unsigned int 500unsigned int
871eio_nready (void) 501eio_nready (void)
872{ 502{
873 return etp_nready (); 503 return etp_nready (EIO_POOL);
874} 504}
875 505
876unsigned int 506unsigned int
877eio_npending (void) 507eio_npending (void)
878{ 508{
879 return etp_npending (); 509 return etp_npending (EIO_POOL);
880} 510}
881 511
882unsigned int ecb_cold 512unsigned int ecb_cold
883eio_nthreads (void) 513eio_nthreads (void)
884{ 514{
885 return etp_nthreads (); 515 return etp_nthreads (EIO_POOL);
886} 516}
887 517
888void ecb_cold 518void ecb_cold
889eio_set_max_poll_time (double nseconds) 519eio_set_max_poll_time (double nseconds)
890{ 520{
891 etp_set_max_poll_time (nseconds); 521 etp_set_max_poll_time (EIO_POOL, nseconds);
892} 522}
893 523
894void ecb_cold 524void ecb_cold
895eio_set_max_poll_reqs (unsigned int maxreqs) 525eio_set_max_poll_reqs (unsigned int maxreqs)
896{ 526{
897 etp_set_max_poll_reqs (maxreqs); 527 etp_set_max_poll_reqs (EIO_POOL, maxreqs);
898} 528}
899 529
900void ecb_cold 530void ecb_cold
901eio_set_max_idle (unsigned int nthreads) 531eio_set_max_idle (unsigned int nthreads)
902{ 532{
903 etp_set_max_idle (nthreads); 533 etp_set_max_idle (EIO_POOL, nthreads);
904} 534}
905 535
906void ecb_cold 536void ecb_cold
907eio_set_idle_timeout (unsigned int seconds) 537eio_set_idle_timeout (unsigned int seconds)
908{ 538{
909 etp_set_idle_timeout (seconds); 539 etp_set_idle_timeout (EIO_POOL, seconds);
910} 540}
911 541
912void ecb_cold 542void ecb_cold
913eio_set_min_parallel (unsigned int nthreads) 543eio_set_min_parallel (unsigned int nthreads)
914{ 544{
915 etp_set_min_parallel (nthreads); 545 etp_set_min_parallel (EIO_POOL, nthreads);
916} 546}
917 547
918void ecb_cold 548void ecb_cold
919eio_set_max_parallel (unsigned int nthreads) 549eio_set_max_parallel (unsigned int nthreads)
920{ 550{
921 etp_set_max_parallel (nthreads); 551 etp_set_max_parallel (EIO_POOL, nthreads);
922} 552}
923 553
924int eio_poll (void) 554int eio_poll (void)
925{ 555{
926 return etp_poll (); 556 return etp_poll (EIO_POOL);
927} 557}
928 558
929/*****************************************************************************/ 559/*****************************************************************************/
930/* work around various missing functions */ 560/* work around various missing functions */
931 561
932#if !HAVE_PREADWRITE 562#if HAVE_POSIX_CLOSE && !__linux
933# undef pread 563# define eio__close(fd) posix_close (fd, 0)
934# undef pwrite 564#else
935# define pread eio__pread 565# define eio__close(fd) close (fd)
936# define pwrite eio__pwrite
937
938static eio_ssize_t
939eio__pread (int fd, void *buf, size_t count, off_t offset)
940{
941 eio_ssize_t res;
942 off_t ooffset;
943
944 X_LOCK (preadwritelock);
945 ooffset = lseek (fd, 0, SEEK_CUR);
946 lseek (fd, offset, SEEK_SET);
947 res = read (fd, buf, count);
948 lseek (fd, ooffset, SEEK_SET);
949 X_UNLOCK (preadwritelock);
950
951 return res;
952}
953
954static eio_ssize_t
955eio__pwrite (int fd, void *buf, size_t count, off_t offset)
956{
957 eio_ssize_t res;
958 off_t ooffset;
959
960 X_LOCK (preadwritelock);
961 ooffset = lseek (fd, 0, SEEK_CUR);
962 lseek (fd, offset, SEEK_SET);
963 res = write (fd, buf, count);
964 lseek (fd, ooffset, SEEK_SET);
965 X_UNLOCK (preadwritelock);
966
967 return res;
968}
969#endif 566#endif
567
568/* close() without disturbing errno */
569static void
570silent_close (int fd)
571{
572 int saved_errno = errno;
573 eio__close (fd);
574 errno = saved_errno;
575}
970 576
971#ifndef HAVE_UTIMES 577#ifndef HAVE_UTIMES
972 578
973# undef utimes 579# undef utimes
974# define utimes(path,times) eio__utimes (path, times) 580# define utimes(path,times) eio__utimes (path, times)
1016 int res; 622 int res;
1017 623
1018#if HAVE_SYS_SYNCFS 624#if HAVE_SYS_SYNCFS
1019 res = (int)syscall (__NR_syncfs, (int)(fd)); 625 res = (int)syscall (__NR_syncfs, (int)(fd));
1020#else 626#else
1021 res = -1; 627 res = EIO_ENOSYS ();
1022 errno = ENOSYS;
1023#endif 628#endif
1024 629
1025 if (res < 0 && errno == ENOSYS && fd >= 0) 630 if (res < 0 && errno == ENOSYS && fd >= 0)
1026 sync (); 631 sync ();
1027 632
1057} 662}
1058 663
1059static int 664static int
1060eio__fallocate (int fd, int mode, off_t offset, size_t len) 665eio__fallocate (int fd, int mode, off_t offset, size_t len)
1061{ 666{
1062#if HAVE_FALLOCATE 667#if HAVE_LINUX_FALLOCATE
1063 return fallocate (fd, mode, offset, len); 668 return fallocate (fd, mode, offset, len);
1064#else 669#else
1065 errno = ENOSYS; 670 return EIO_ENOSYS ();
1066 return -1;
1067#endif 671#endif
1068} 672}
1069 673
1070#if !HAVE_READAHEAD 674#if !HAVE_READAHEAD
1071# undef readahead 675# undef readahead
1086 todo -= len; 690 todo -= len;
1087 } 691 }
1088 692
1089 FUBd; 693 FUBd;
1090 694
1091 errno = 0; 695 /* linux's readahead basically only fails for EBADF or EINVAL (not mmappable) */
696 /* but not for e.g. EIO or eof, so we also never fail */
1092 return count; 697 return 0;
1093} 698}
1094 699
1095#endif 700#endif
1096 701
1097/* sendfile always needs emulation */ 702/* sendfile always needs emulation */
1132 737
1133 /* according to source inspection, this is correct, and useful behaviour */ 738 /* according to source inspection, this is correct, and useful behaviour */
1134 if (sbytes) 739 if (sbytes)
1135 res = sbytes; 740 res = sbytes;
1136 741
1137# elif defined (__APPLE__) 742# elif defined __APPLE__
1138 off_t sbytes = count; 743 off_t sbytes = count;
1139 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 744 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1140 745
1141 /* according to the manpage, sbytes is always valid */ 746 /* according to the manpage, sbytes is always valid */
1142 if (sbytes) 747 if (sbytes)
1169 HANDLE h = TO_SOCKET (ifd); 774 HANDLE h = TO_SOCKET (ifd);
1170 SetFilePointer (h, offset, 0, FILE_BEGIN); 775 SetFilePointer (h, offset, 0, FILE_BEGIN);
1171 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0); 776 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1172 777
1173#else 778#else
1174 res = -1; 779 res = EIO_ENOSYS ();
1175 errno = ENOSYS;
1176#endif 780#endif
1177 781
1178 /* we assume sendfile can copy at least 128mb in one go */ 782 /* we assume sendfile can copy at least 128mb in one go */
1179 if (res <= 128 * 1024 * 1024) 783 if (res <= 128 * 1024 * 1024)
1180 { 784 {
1355 intptr_t end = addr + len; 959 intptr_t end = addr + len;
1356 intptr_t page = eio_pagesize (); 960 intptr_t page = eio_pagesize ();
1357 961
1358 if (addr < end) 962 if (addr < end)
1359 if (flags & EIO_MT_MODIFY) /* modify */ 963 if (flags & EIO_MT_MODIFY) /* modify */
1360 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len && !EIO_CANCELLED (req)); 964 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < end && !EIO_CANCELLED (req));
1361 else 965 else
1362 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len && !EIO_CANCELLED (req)); 966 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < end && !EIO_CANCELLED (req));
1363 } 967 }
1364 968
1365 return 0; 969 return 0;
1366} 970}
1367 971
1368/*****************************************************************************/ 972/*****************************************************************************/
1369/* requests implemented outside eio_execute, because they are so large */ 973/* requests implemented outside eio_execute, because they are so large */
1370 974
1371/* copies some absolute path to tmpbuf */ 975static void
1372static char * 976eio__lseek (eio_req *req)
1373eio__getwd (struct tmpbuf *tmpbuf, eio_wd wd)
1374{ 977{
1375 if (wd == EIO_CWD) 978 /* this usually gets optimised away completely, or your compiler sucks, */
1376 return getcwd (tmpbuf->ptr, PATH_MAX); 979 /* or the whence constants really are not 0, 1, 2 */
980 int whence = req->int2 == EIO_SEEK_SET ? SEEK_SET
981 : req->int2 == EIO_SEEK_CUR ? SEEK_CUR
982 : req->int2 == EIO_SEEK_END ? SEEK_END
983 : req->int2;
1377 984
1378#if HAVE_AT 985 req->offs = lseek (req->int1, req->offs, whence);
1379 abort (); /*TODO*/ 986 req->result = req->offs == (off_t)-1 ? -1 : 0;
1380#else
1381 strcpy (tmpbuf->ptr, wd);
1382#endif
1383 return tmpbuf->ptr;
1384} 987}
1385 988
1386/* result will always end up in tmpbuf, there is always space for adding a 0-byte */ 989/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
1387static int 990static int
1388eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path) 991eio__realpath (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
1389{ 992{
993 char *res;
1390 const char *rel = path; 994 const char *rel = path;
1391 char *res;
1392 char *tmp1, *tmp2; 995 char *tmp1, *tmp2;
1393#if SYMLOOP_MAX > 32 996#if SYMLOOP_MAX > 32
1394 int symlinks = SYMLOOP_MAX; 997 int symlinks = SYMLOOP_MAX;
1395#else 998#else
1396 int symlinks = 32; 999 int symlinks = 32;
1397#endif 1000#endif
1398 1001
1399 /*D*/ /*TODO: wd ignored */
1400
1401 errno = EINVAL; 1002 errno = EINVAL;
1402 if (!rel) 1003 if (!rel)
1403 return -1; 1004 return -1;
1404 1005
1405 errno = ENOENT; 1006 errno = ENOENT;
1406 if (!*rel) 1007 if (!*rel)
1407 return -1; 1008 return -1;
1408 1009
1409 res = tmpbuf_get (tmpbuf, PATH_MAX * 3); 1010 res = etp_tmpbuf_get (tmpbuf, EIO_PATH_MAX * 3);
1011#ifdef _WIN32
1012 if (_access (rel, 4) != 0)
1013 return -1;
1014
1015 symlinks = GetFullPathName (rel, EIO_PATH_MAX * 3, res, 0);
1016
1017 errno = ENAMETOOLONG;
1018 if (symlinks >= EIO_PATH_MAX * 3)
1019 return -1;
1020
1021 errno = EIO;
1022 if (symlinks <= 0)
1023 return -1;
1024
1025 return symlinks;
1026
1027#else
1410 tmp1 = res + PATH_MAX; 1028 tmp1 = res + EIO_PATH_MAX;
1411 tmp2 = tmp1 + PATH_MAX; 1029 tmp2 = tmp1 + EIO_PATH_MAX;
1412 1030
1413#if 0 /* disabled, the musl way to do things is just too racy */ 1031#if 0 /* disabled, the musl way to do things is just too racy */
1414#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1032#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1415 /* on linux we may be able to ask the kernel */ 1033 /* on linux we may be able to ask the kernel */
1416 { 1034 {
1417 int fd = open (rel, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOATIME); 1035 int fd = open (rel, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOATIME);
1418 1036
1419 if (fd >= 0) 1037 if (fd >= 0)
1420 { 1038 {
1421 sprintf (tmp1, "/proc/self/fd/%d", fd); 1039 sprintf (tmp1, "/proc/self/fd/%d", fd);
1422 req->result = readlink (tmp1, res, PATH_MAX); 1040 req->result = readlink (tmp1, res, EIO_PATH_MAX);
1423 close (fd);
1424
1425 /* here we should probably stat the open file and the disk file, to make sure they still match */ 1041 /* here we should probably stat the open file and the disk file, to make sure they still match */
1042 eio__close (fd);
1426 1043
1427 if (req->result > 0) 1044 if (req->result > 0)
1428 goto done; 1045 goto done;
1429 } 1046 }
1430 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO) 1047 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO)
1431 return; 1048 return -1;
1432 } 1049 }
1433#endif 1050#endif
1434#endif 1051#endif
1435 1052
1436 if (*rel != '/') 1053 if (*rel != '/')
1437 { 1054 {
1438 if (!eio__getwd (tmpbuf, wd)) 1055 int len;
1056
1057 errno = ENOENT;
1058 if (wd == EIO_INVALID_WD)
1439 return -1; 1059 return -1;
1060
1061 if (wd == EIO_CWD)
1062 {
1063 if (!getcwd (res, EIO_PATH_MAX))
1064 return -1;
1065
1066 len = strlen (res);
1067 }
1068 else
1069 memcpy (res, wd->str, len = wd->len);
1440 1070
1441 if (res [1]) /* only use if not / */ 1071 if (res [1]) /* only use if not / */
1442 res += strlen (res); 1072 res += len;
1443 } 1073 }
1444 1074
1445 while (*rel) 1075 while (*rel)
1446 { 1076 {
1447 eio_ssize_t len, linklen; 1077 eio_ssize_t len, linklen;
1475 } 1105 }
1476 } 1106 }
1477 1107
1478 errno = ENAMETOOLONG; 1108 errno = ENAMETOOLONG;
1479 if (res + 1 + len + 1 >= tmp1) 1109 if (res + 1 + len + 1 >= tmp1)
1480 return; 1110 return -1;
1481 1111
1482 /* copy one component */ 1112 /* copy one component */
1483 *res = '/'; 1113 *res = '/';
1484 memcpy (res + 1, beg, len); 1114 memcpy (res + 1, beg, len);
1485 1115
1486 /* zero-terminate, for readlink */ 1116 /* zero-terminate, for readlink */
1487 res [len + 1] = 0; 1117 res [len + 1] = 0;
1488 1118
1489 /* now check if it's a symlink */ 1119 /* now check if it's a symlink */
1490 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX); 1120 linklen = readlink (tmpbuf->ptr, tmp1, EIO_PATH_MAX);
1491 1121
1492 if (linklen < 0) 1122 if (linklen < 0)
1493 { 1123 {
1494 if (errno != EINVAL) 1124 if (errno != EINVAL)
1495 return -1; 1125 return -1;
1501 { 1131 {
1502 /* yay, it was a symlink - build new path in tmp2 */ 1132 /* yay, it was a symlink - build new path in tmp2 */
1503 int rellen = strlen (rel); 1133 int rellen = strlen (rel);
1504 1134
1505 errno = ENAMETOOLONG; 1135 errno = ENAMETOOLONG;
1506 if (linklen + 1 + rellen >= PATH_MAX) 1136 if (linklen + 1 + rellen >= EIO_PATH_MAX) /* also catch linklen >= EIO_PATH_MAX */
1507 return -1; 1137 return -1;
1508 1138
1509 errno = ELOOP; 1139 errno = ELOOP;
1510 if (!--symlinks) 1140 if (!--symlinks)
1511 return -1; 1141 return -1;
1525 /* special case for the lone root path */ 1155 /* special case for the lone root path */
1526 if (res == tmpbuf->ptr) 1156 if (res == tmpbuf->ptr)
1527 *res++ = '/'; 1157 *res++ = '/';
1528 1158
1529 return res - (char *)tmpbuf->ptr; 1159 return res - (char *)tmpbuf->ptr;
1160#endif
1530} 1161}
1531 1162
1532static signed char 1163static signed char
1533eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1164eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1534{ 1165{
1694 eio_dent_insertion_sort (dents, size); 1325 eio_dent_insertion_sort (dents, size);
1695} 1326}
1696 1327
1697/* read a full directory */ 1328/* read a full directory */
1698static void 1329static void
1699eio__scandir (eio_req *req) 1330eio__scandir (eio_req *req, etp_worker *self)
1700{ 1331{
1701 char *name, *names; 1332 char *name, *names;
1702 int namesalloc = 4096 - sizeof (void *) * 4; 1333 int namesalloc = 4096 - sizeof (void *) * 4;
1703 int namesoffs = 0; 1334 int namesoffs = 0;
1704 int flags = req->int1; 1335 int flags = req->int1;
1722#ifdef _WIN32 1353#ifdef _WIN32
1723 { 1354 {
1724 int len = strlen ((const char *)req->ptr1); 1355 int len = strlen ((const char *)req->ptr1);
1725 char *path = malloc (MAX_PATH); 1356 char *path = malloc (MAX_PATH);
1726 const char *fmt; 1357 const char *fmt;
1358 const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1727 1359
1728 if (!len) 1360 if (!len)
1729 fmt = "./*"; 1361 fmt = "./*";
1730 else if (((const char *)req->ptr1)[len - 1] == '/' || ((const char *)req->ptr1)[len - 1] == '\\') 1362 else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1731 fmt = "%s*"; 1363 fmt = "%s*";
1732 else 1364 else
1733 fmt = "%s/*"; 1365 fmt = "%s/*";
1734 1366
1735 _snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1); 1367 _snprintf (path, MAX_PATH, fmt, reqpath);
1736 dirp = FindFirstFile (path, &entp); 1368 dirp = FindFirstFile (path, &entp);
1737 free (path); 1369 free (path);
1738 1370
1739 if (dirp == INVALID_HANDLE_VALUE) 1371 if (dirp == INVALID_HANDLE_VALUE)
1740 { 1372 {
1762 1394
1763 return; 1395 return;
1764 } 1396 }
1765 } 1397 }
1766#else 1398#else
1399 #if HAVE_AT
1400 if (req->wd)
1401 {
1402 int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1403
1404 if (fd < 0)
1405 return;
1406
1407 dirp = fdopendir (fd);
1408
1409 if (!dirp)
1410 silent_close (fd);
1411 }
1412 else
1767 dirp = opendir (req->ptr1); 1413 dirp = opendir (req->ptr1);
1414 #else
1415 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
1416 #endif
1768 1417
1769 if (!dirp) 1418 if (!dirp)
1770 return; 1419 return;
1771#endif 1420#endif
1772 1421
1889 #ifdef DT_FIFO 1538 #ifdef DT_FIFO
1890 case DT_FIFO: ent->type = EIO_DT_FIFO; break; 1539 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1891 #endif 1540 #endif
1892 #ifdef DT_CHR 1541 #ifdef DT_CHR
1893 case DT_CHR: ent->type = EIO_DT_CHR; break; 1542 case DT_CHR: ent->type = EIO_DT_CHR; break;
1894 #endif 1543 #endif
1895 #ifdef DT_MPC 1544 #ifdef DT_MPC
1896 case DT_MPC: ent->type = EIO_DT_MPC; break; 1545 case DT_MPC: ent->type = EIO_DT_MPC; break;
1897 #endif 1546 #endif
1898 #ifdef DT_DIR 1547 #ifdef DT_DIR
1899 case DT_DIR: ent->type = EIO_DT_DIR; break; 1548 case DT_DIR: ent->type = EIO_DT_DIR; break;
1900 #endif 1549 #endif
1901 #ifdef DT_NAM 1550 #ifdef DT_NAM
1902 case DT_NAM: ent->type = EIO_DT_NAM; break; 1551 case DT_NAM: ent->type = EIO_DT_NAM; break;
1903 #endif 1552 #endif
1904 #ifdef DT_BLK 1553 #ifdef DT_BLK
1905 case DT_BLK: ent->type = EIO_DT_BLK; break; 1554 case DT_BLK: ent->type = EIO_DT_BLK; break;
1906 #endif 1555 #endif
1907 #ifdef DT_MPB 1556 #ifdef DT_MPB
1908 case DT_MPB: ent->type = EIO_DT_MPB; break; 1557 case DT_MPB: ent->type = EIO_DT_MPB; break;
1909 #endif 1558 #endif
1910 #ifdef DT_REG 1559 #ifdef DT_REG
1911 case DT_REG: ent->type = EIO_DT_REG; break; 1560 case DT_REG: ent->type = EIO_DT_REG; break;
1912 #endif 1561 #endif
1913 #ifdef DT_NWK 1562 #ifdef DT_NWK
1914 case DT_NWK: ent->type = EIO_DT_NWK; break; 1563 case DT_NWK: ent->type = EIO_DT_NWK; break;
1915 #endif 1564 #endif
1916 #ifdef DT_CMP 1565 #ifdef DT_CMP
1917 case DT_CMP: ent->type = EIO_DT_CMP; break; 1566 case DT_CMP: ent->type = EIO_DT_CMP; break;
1918 #endif 1567 #endif
1919 #ifdef DT_LNK 1568 #ifdef DT_LNK
1920 case DT_LNK: ent->type = EIO_DT_LNK; break; 1569 case DT_LNK: ent->type = EIO_DT_LNK; break;
1921 #endif 1570 #endif
1922 #ifdef DT_SOCK 1571 #ifdef DT_SOCK
1923 case DT_SOCK: ent->type = EIO_DT_SOCK; break; 1572 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1936 { 1585 {
1937 if (ent->type == EIO_DT_UNKNOWN) 1586 if (ent->type == EIO_DT_UNKNOWN)
1938 { 1587 {
1939 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */ 1588 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1940 ent->score = 1; 1589 ent->score = 1;
1941 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */ 1590 else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1942 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */ 1591 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1943 } 1592 }
1944 else if (ent->type == EIO_DT_DIR) 1593 else if (ent->type == EIO_DT_DIR)
1945 ent->score = 0; 1594 ent->score = 0;
1946 } 1595 }
1966 } 1615 }
1967} 1616}
1968 1617
1969/*****************************************************************************/ 1618/*****************************************************************************/
1970/* working directory stuff */ 1619/* working directory stuff */
1620/* various deficiencies in the posix 2008 api force us to */
1621/* keep the absolute path in string form at all times */
1622/* fuck yeah. */
1623
1624#if !HAVE_AT
1625
1626/* a bit like realpath, but usually faster because it doesn'T have to return */
1627/* an absolute or canonical path */
1628static const char *
1629wd_expand (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
1630{
1631 if (!wd || *path == '/')
1632 return path;
1633
1634 if (path [0] == '.' && !path [1])
1635 return wd->str;
1636
1637 {
1638 int l1 = wd->len;
1639 int l2 = strlen (path);
1640
1641 char *res = etp_tmpbuf_get (tmpbuf, l1 + l2 + 2);
1642
1643 memcpy (res, wd->str, l1);
1644 res [l1] = '/';
1645 memcpy (res + l1 + 1, path, l2 + 1);
1646
1647 return res;
1648 }
1649}
1650
1651#endif
1652
1653static eio_wd
1654eio__wd_open_sync (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
1655{
1656 int fd;
1657 eio_wd res;
1658 int len = eio__realpath (tmpbuf, wd, path);
1659
1660 if (len < 0)
1661 return EIO_INVALID_WD;
1971 1662
1972#if HAVE_AT 1663#if HAVE_AT
1664 fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1973 1665
1974#define WD2FD(wd) ((wd) ? ((int)(long)(wd)) - 1 : AT_FDCWD) 1666 if (fd < 0)
1975 1667 return EIO_INVALID_WD;
1976#ifndef O_SEARCH
1977# define O_SEARCH O_RDONLY
1978#endif 1668#endif
1669
1670 res = malloc (sizeof (*res) + len); /* one extra 0-byte */
1671
1672#if HAVE_AT
1673 res->fd = fd;
1674#endif
1675
1676 res->len = len;
1677 memcpy (res->str, tmpbuf->ptr, len);
1678 res->str [len] = 0;
1679
1680 return res;
1681}
1979 1682
1980eio_wd 1683eio_wd
1981eio_wd_open_sync (eio_wd wd, const char *path) 1684eio_wd_open_sync (eio_wd wd, const char *path)
1982{ 1685{
1983 int fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY); 1686 struct etp_tmpbuf tmpbuf = { };
1984
1985 return fd >= 0 ? (eio_wd)(long)(fd + 1) : EIO_INVALID_WD;
1986}
1987
1988static eio_wd
1989eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
1990{
1991 return eio_wd_open_sync (wd, path); 1687 wd = eio__wd_open_sync (&tmpbuf, wd, path);
1688 free (tmpbuf.ptr);
1689
1690 return wd;
1992} 1691}
1993 1692
1994void 1693void
1995eio_wd_close_sync (eio_wd wd) 1694eio_wd_close_sync (eio_wd wd)
1996{ 1695{
1997 int fd = WD2FD (wd); 1696 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
1998 1697 {
1999 if (fd >= 0) 1698 #if HAVE_AT
2000 close (fd); 1699 eio__close (wd->fd);
1700 #endif
1701 free (wd);
1702 }
2001} 1703}
1704
1705#if HAVE_AT
1706
1707static int
1708eio__renameat2 (int olddirfd, const char *oldpath, int newdirfd, const char *newpath, unsigned int flags)
1709{
1710#if HAVE_RENAMEAT2
1711 return syscall (SYS_renameat2, olddirfd, oldpath, newdirfd, newpath, flags);
1712#else
1713 if (flags)
1714 return EIO_ENOSYS ();
1715
1716 return renameat (olddirfd, oldpath, newdirfd, newpath);
1717#endif
1718}
1719
1720/* they forgot these */
2002 1721
2003static int 1722static int
2004eio__truncateat (int dirfd, const char *path, off_t length) 1723eio__truncateat (int dirfd, const char *path, off_t length)
2005{ 1724{
2006 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC); 1725 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
2008 1727
2009 if (fd < 0) 1728 if (fd < 0)
2010 return fd; 1729 return fd;
2011 1730
2012 res = ftruncate (fd, length); 1731 res = ftruncate (fd, length);
2013 close (fd); 1732 silent_close (fd);
2014 return res; 1733 return res;
2015} 1734}
2016 1735
2017static int 1736static int
2018eio__statvfsat (int dirfd, const char *path, struct statvfs *buf) 1737eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
2022 1741
2023 if (fd < 0) 1742 if (fd < 0)
2024 return fd; 1743 return fd;
2025 1744
2026 res = fstatvfs (fd, buf); 1745 res = fstatvfs (fd, buf);
2027 close (fd); 1746 silent_close (fd);
2028 return res; 1747 return res;
2029
2030}
2031
2032#else
2033
2034/* on legacy systems, we represent the working directories simply by their path strings */
2035
2036static const char *
2037wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2038{
2039 if (!wd || *path == '/')
2040 return path;
2041
2042 {
2043 int l1 = strlen ((const char *)wd);
2044 int l2 = strlen (path);
2045
2046 char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2);
2047
2048 memcpy (res, wd, l1);
2049 res [l1] = '/';
2050 memcpy (res + l1 + 1, path, l2 + 1);
2051
2052 return res;
2053 }
2054}
2055
2056static eio_wd
2057eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2058{
2059 if (*path == '/') /* absolute paths ignore wd */
2060 path = strdup (path);
2061 else if (path [0] == '.' && !path [1]) /* special case '.', as it is common */
2062 return wd;
2063 else
2064 {
2065 int len = eio__realpath (tmpbuf, wd, path);
2066
2067 path = EIO_INVALID_WD;
2068
2069 if (len >= 0)
2070 {
2071 ((char *)tmpbuf->ptr)[len] = 0;
2072 path = strdup (tmpbuf->ptr);
2073 }
2074 }
2075
2076 if (!path)
2077 path = EIO_INVALID_WD;
2078
2079 return (eio_wd)path;
2080}
2081
2082eio_wd
2083eio_wd_open_sync (eio_wd wd, const char *path)
2084{
2085 struct tmpbuf tmpbuf = { 0 };
2086 wd = eio__wd_open_sync (&tmpbuf, wd, path);
2087 free (tmpbuf.ptr);
2088
2089 return wd;
2090}
2091
2092void
2093eio_wd_close_sync (eio_wd wd)
2094{
2095 if (wd != EIO_INVALID_WD)
2096 free (wd);
2097} 1748}
2098 1749
2099#endif 1750#endif
2100 1751
2101/*****************************************************************************/ 1752/*****************************************************************************/
2102 1753
2103#define ALLOC(len) \ 1754#define ALLOC(len) \
2104 if (!req->ptr2) \ 1755 if (!req->ptr2) \
2105 { \ 1756 { \
2106 X_LOCK (wrklock); \ 1757 X_LOCK (EIO_POOL->wrklock); \
2107 req->flags |= EIO_FLAG_PTR2_FREE; \ 1758 req->flags |= EIO_FLAG_PTR2_FREE; \
2108 X_UNLOCK (wrklock); \ 1759 X_UNLOCK (EIO_POOL->wrklock); \
2109 req->ptr2 = malloc (len); \ 1760 req->ptr2 = malloc (len); \
2110 if (!req->ptr2) \ 1761 if (!req->ptr2) \
2111 { \ 1762 { \
2112 errno = ENOMEM; \ 1763 errno = ENOMEM; \
2113 req->result = -1; \ 1764 req->result = -1; \
2114 break; \ 1765 goto alloc_fail; \
2115 } \ 1766 } \
2116 } 1767 }
2117 1768
2118X_THREAD_PROC (etp_proc) 1769/*****************************************************************************/
2119{
2120 ETP_REQ *req;
2121 struct timespec ts;
2122 etp_worker *self = (etp_worker *)thr_arg;
2123 1770
2124#if HAVE_PRCTL_SET_NAME 1771static void
2125 prctl (PR_SET_NAME, (unsigned long)"eio_thread", 0, 0, 0); 1772eio__slurp (int fd, eio_req *req)
2126#endif 1773{
1774 req->result = fd;
2127 1775
2128 /* try to distribute timeouts somewhat evenly */ 1776 if (fd < 0)
2129 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 1777 return;
2130 1778
2131 for (;;) 1779 if (req->offs < 0 || !req->size) /* do we need the size? */
2132 { 1780 {
2133 ts.tv_sec = 0; 1781 off_t size = lseek (fd, 0, SEEK_END);
2134 1782
2135 X_LOCK (reqlock);
2136
2137 for (;;)
2138 {
2139 req = reqq_shift (&req_queue);
2140
2141 if (req)
2142 break;
2143
2144 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
2145 {
2146 X_UNLOCK (reqlock);
2147 X_LOCK (wrklock);
2148 --started;
2149 X_UNLOCK (wrklock);
2150 goto quit;
2151 }
2152
2153 ++idle;
2154
2155 if (idle <= max_idle)
2156 /* we are allowed to idle, so do so without any timeout */
2157 X_COND_WAIT (reqwait, reqlock);
2158 else
2159 {
2160 /* initialise timeout once */
2161 if (!ts.tv_sec)
2162 ts.tv_sec = time (0) + idle_timeout;
2163
2164 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
2165 ts.tv_sec = 1; /* assuming this is not a value computed above.,.. */
2166 }
2167
2168 --idle;
2169 }
2170
2171 --nready;
2172
2173 X_UNLOCK (reqlock);
2174
2175 if (req->type < 0) 1783 if (req->offs < 0)
2176 goto quit; 1784 req->offs += size;
2177 1785
2178 ETP_EXECUTE (self, req); 1786 if (!req->size)
2179 1787 req->size = size - req->offs;
2180 X_LOCK (reslock);
2181
2182 ++npending;
2183
2184 if (!reqq_push (&res_queue, req) && want_poll_cb)
2185 want_poll_cb ();
2186
2187 etp_worker_clear (self);
2188
2189 X_UNLOCK (reslock);
2190 } 1788 }
2191 1789
2192quit: 1790 ALLOC (req->size);
2193 free (req); 1791 req->result = pread (fd, req->ptr2, req->size, req->offs);
2194 1792
2195 X_LOCK (wrklock); 1793 silent_close (fd);
2196 etp_worker_free (self);
2197 X_UNLOCK (wrklock);
2198 1794
2199 return 0; 1795alloc_fail:
1796 ;
2200} 1797}
2201
2202/*****************************************************************************/
2203 1798
2204int ecb_cold 1799int ecb_cold
2205eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1800eio_init (void (*want_poll)(void), void (*done_poll)(void))
2206{ 1801{
2207#if !HAVE_PREADWRITE 1802 eio_want_poll_cb = want_poll;
2208 X_MUTEX_CREATE (preadwritelock); 1803 eio_done_poll_cb = done_poll;
2209#endif
2210 1804
2211 return etp_init (want_poll, done_poll); 1805 return etp_init (EIO_POOL, 0, 0, 0);
2212} 1806}
2213 1807
2214ecb_inline void 1808ecb_inline void
2215eio_api_destroy (eio_req *req) 1809eio_api_destroy (eio_req *req)
2216{ 1810{
2217 free (req); 1811 free (req);
2218} 1812}
2219 1813
2220#define REQ(rtype) \ 1814#define REQ(rtype) \
2221 eio_req *req; \ 1815 eio_req *req; \
2222 \ 1816 \
2223 req = (eio_req *)calloc (1, sizeof *req); \ 1817 req = (eio_req *)calloc (1, sizeof *req); \
2224 if (!req) \ 1818 if (!req) \
2225 return 0; \ 1819 return 0; \
2239 { \ 1833 { \
2240 eio_api_destroy (req); \ 1834 eio_api_destroy (req); \
2241 return 0; \ 1835 return 0; \
2242 } 1836 }
2243 1837
1838#define SINGLEDOT(ptr) (0[(char *)(ptr)] == '.' && !1[(char *)(ptr)])
1839
2244static void 1840static void
2245eio_execute (etp_worker *self, eio_req *req) 1841eio_execute (etp_worker *self, eio_req *req)
2246{ 1842{
2247#if HAVE_AT 1843#if HAVE_AT
2248 int dirfd; 1844 int dirfd;
2279 req->result = req->wd == EIO_INVALID_WD ? -1 : 0; 1875 req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
2280 break; 1876 break;
2281 case EIO_WD_CLOSE: req->result = 0; 1877 case EIO_WD_CLOSE: req->result = 0;
2282 eio_wd_close_sync (req->wd); break; 1878 eio_wd_close_sync (req->wd); break;
2283 1879
1880 case EIO_SEEK: eio__lseek (req); break;
2284 case EIO_READ: ALLOC (req->size); 1881 case EIO_READ: ALLOC (req->size);
2285 req->result = req->offs >= 0 1882 req->result = req->offs >= 0
2286 ? pread (req->int1, req->ptr2, req->size, req->offs) 1883 ? pread (req->int1, req->ptr2, req->size, req->offs)
2287 : read (req->int1, req->ptr2, req->size); break; 1884 : read (req->int1, req->ptr2, req->size); break;
2288 case EIO_WRITE: req->result = req->offs >= 0 1885 case EIO_WRITE: req->result = req->offs >= 0
2289 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 1886 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
2290 : write (req->int1, req->ptr2, req->size); break; 1887 : write (req->int1, req->ptr2, req->size); break;
1888
1889 case EIO_FCNTL: req->result = fcntl (req->int1, (int) req->int2, req->ptr2); break;
1890 case EIO_IOCTL: req->result = ioctl (req->int1, (unsigned long)req->int2, req->ptr2); break;
2291 1891
2292 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 1892 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
2293 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break; 1893 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
2294 1894
2295#if HAVE_AT 1895#if HAVE_AT
2300 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break; 1900 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
2301 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break; 1901 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
2302 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break; 1902 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
2303 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break; 1903 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
2304 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break; 1904 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
1905 case EIO_SLURP: eio__slurp ( openat (dirfd, req->ptr1, O_RDONLY | O_CLOEXEC), req); break;
2305 1906
2306 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break; 1907 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
2307 case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break; 1908 case EIO_RMDIR: /* complications arise because "." cannot be removed, so we might have to expand */
1909 req->result = req->wd && SINGLEDOT (req->ptr1)
1910 ? rmdir (req->wd->str)
1911 : unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
2308 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break; 1912 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
2309 case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD (req->int3), req->ptr2); break; 1913 case EIO_RENAME: req->result = eio__renameat2 (
1914 dirfd,
1915 /* complications arise because "." cannot be renamed, so we might have to expand */
1916 req->wd && SINGLEDOT (req->ptr1) ? req->wd->str : req->ptr1,
1917 WD2FD ((eio_wd)req->int3),
1918 req->ptr2,
1919 req->int2
1920 );
1921 break;
2310 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD (req->int3), req->ptr2, 0); break; 1922 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
2311 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break; 1923 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
2312 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break; 1924 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2313 case EIO_READLINK: ALLOC (PATH_MAX);
2314 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
2315 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 1925 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2316 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 1926 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1927 case EIO_READLINK: ALLOC (EIO_PATH_MAX);
1928 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, EIO_PATH_MAX);
1929 if (req->result == EIO_PATH_MAX)
1930 {
1931 req->result = -1;
1932 errno = ENAMETOOLONG;
1933 }
1934 break;
2317 case EIO_UTIME: 1935 case EIO_UTIME:
2318 case EIO_FUTIME: 1936 case EIO_FUTIME:
2319 { 1937 {
2320 struct timespec ts[2]; 1938 struct timespec ts[2];
2321 struct timespec *times; 1939 struct timespec *times;
2346 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break; 1964 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2347 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break; 1965 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
2348 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break; 1966 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
2349 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break; 1967 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
2350 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break; 1968 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
1969 case EIO_SLURP: eio__slurp ( open (path , O_RDONLY | O_CLOEXEC), req); break;
2351 1970
2352 case EIO_UNLINK: req->result = unlink (path ); break; 1971 case EIO_UNLINK: req->result = unlink (path ); break;
2353 case EIO_RMDIR: req->result = rmdir (path ); break; 1972 case EIO_RMDIR: req->result = rmdir (path ); break;
2354 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break; 1973 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
2355 case EIO_RENAME: req->result = rename (path , req->ptr2); break; 1974 case EIO_RENAME: req->result = req->int2 ? EIO_ENOSYS () : rename (path, req->ptr2); break;
2356 case EIO_LINK: req->result = link (path , req->ptr2); break; 1975 case EIO_LINK: req->result = link (path , req->ptr2); break;
2357 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break; 1976 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
2358 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break; 1977 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
2359 case EIO_READLINK: ALLOC (PATH_MAX);
2360 req->result = readlink (path, req->ptr2, PATH_MAX); break;
2361 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 1978 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2362 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break; 1979 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
1980 case EIO_READLINK: ALLOC (EIO_PATH_MAX);
1981 req->result = readlink (path, req->ptr2, EIO_PATH_MAX);
1982 if (req->result == EIO_PATH_MAX)
1983 {
1984 req->result = -1;
1985 errno = ENAMETOOLONG;
1986 }
1987 break;
2363 1988
2364 case EIO_UTIME: 1989 case EIO_UTIME:
2365 case EIO_FUTIME: 1990 case EIO_FUTIME:
2366 { 1991 {
2367 struct timeval tv[2]; 1992 struct timeval tv[2];
2402 2027
2403 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break; 2028 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
2404 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break; 2029 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
2405 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break; 2030 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2406 2031
2407 case EIO_CLOSE: req->result = close (req->int1); break; 2032 case EIO_CLOSE: req->result = eio__close (req->int1); break;
2408 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 2033 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
2409 case EIO_SYNC: req->result = 0; sync (); break; 2034 case EIO_SYNC: req->result = 0; sync (); break;
2410 case EIO_FSYNC: req->result = fsync (req->int1); break; 2035 case EIO_FSYNC: req->result = fsync (req->int1); break;
2411 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2036 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2412 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break; 2037 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
2415 case EIO_MTOUCH: req->result = eio__mtouch (req); break; 2040 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2416 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break; 2041 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2417 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 2042 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2418 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break; 2043 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2419 2044
2420 case EIO_READDIR: eio__scandir (req); break; 2045 case EIO_READDIR: eio__scandir (req, self); break;
2421 2046
2422 case EIO_BUSY: 2047 case EIO_BUSY:
2423#ifdef _WIN32 2048#ifdef _WIN32
2424 Sleep (req->nv1 * 1e3); 2049 Sleep (req->nv1 * 1e3);
2425#else 2050#else
2432 req->result = select (0, 0, 0, 0, &tv); 2057 req->result = select (0, 0, 0, 0, &tv);
2433 } 2058 }
2434#endif 2059#endif
2435 break; 2060 break;
2436 2061
2062#if 0
2437 case EIO_GROUP: 2063 case EIO_GROUP:
2438 abort (); /* handled in eio_request */ 2064 abort (); /* handled in eio_request */
2065#endif
2439 2066
2440 case EIO_NOP: 2067 case EIO_NOP:
2441 req->result = 0; 2068 req->result = 0;
2442 break; 2069 break;
2443 2070
2444 case EIO_CUSTOM: 2071 case EIO_CUSTOM:
2445 req->feed (req); 2072 req->feed (req);
2446 break; 2073 break;
2447 2074
2448 default: 2075 default:
2449 errno = ENOSYS;
2450 req->result = -1; 2076 req->result = EIO_ENOSYS ();
2451 break; 2077 break;
2452 } 2078 }
2453 2079
2080alloc_fail:
2454 req->errorno = errno; 2081 req->errorno = errno;
2455} 2082}
2456 2083
2457#ifndef EIO_NO_WRAPPERS 2084#ifndef EIO_NO_WRAPPERS
2458 2085
2086eio_req *eio_wd_open (const char *path, int pri, eio_cb cb, void *data)
2087{
2088 REQ (EIO_WD_OPEN); PATH; SEND;
2089}
2090
2091eio_req *eio_wd_close (eio_wd wd, int pri, eio_cb cb, void *data)
2092{
2093 REQ (EIO_WD_CLOSE); req->wd = wd; SEND;
2094}
2095
2459eio_req *eio_nop (int pri, eio_cb cb, void *data) 2096eio_req *eio_nop (int pri, eio_cb cb, void *data)
2460{ 2097{
2461 REQ (EIO_NOP); SEND; 2098 REQ (EIO_NOP); SEND;
2462} 2099}
2463 2100
2524eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data) 2161eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data)
2525{ 2162{
2526 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND; 2163 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND;
2527} 2164}
2528 2165
2166eio_req *eio_seek (int fd, off_t offset, int whence, int pri, eio_cb cb, void *data)
2167{
2168 REQ (EIO_SEEK); req->int1 = fd; req->offs = offset; req->int2 = whence; SEND;
2169}
2170
2529eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data) 2171eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2530{ 2172{
2531 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND; 2173 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
2532} 2174}
2533 2175
2534eio_req *eio_write (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data) 2176eio_req *eio_write (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2535{ 2177{
2536 REQ (EIO_WRITE); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND; 2178 REQ (EIO_WRITE); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
2179}
2180
2181eio_req *eio_fcntl (int fd, int cmd, void *arg, int pri, eio_cb cb, void *data)
2182{
2183 REQ (EIO_IOCTL); req->int1 = fd; req->int2 = cmd; req->ptr2 = arg; SEND;
2184}
2185
2186eio_req *eio_ioctl (int fd, unsigned long request, void *buf, int pri, eio_cb cb, void *data)
2187{
2188 REQ (EIO_IOCTL); req->int1 = fd; req->int2 = request; req->ptr2 = buf; SEND;
2537} 2189}
2538 2190
2539eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data) 2191eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data)
2540{ 2192{
2541 REQ (EIO_FSTAT); req->int1 = fd; SEND; 2193 REQ (EIO_FSTAT); req->int1 = fd; SEND;
2686eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data) 2338eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
2687{ 2339{
2688 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 2340 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
2689} 2341}
2690 2342
2343eio_req *eio_slurp (const char *path, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2344{
2345 REQ (EIO_SLURP); PATH; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
2346}
2347
2691eio_req *eio_custom (void (*execute)(eio_req *), int pri, eio_cb cb, void *data) 2348eio_req *eio_custom (void (*execute)(eio_req *), int pri, eio_cb cb, void *data)
2692{ 2349{
2693 REQ (EIO_CUSTOM); req->feed = execute; SEND; 2350 REQ (EIO_CUSTOM); req->feed = execute; SEND;
2694} 2351}
2695 2352
2729void 2386void
2730eio_grp_add (eio_req *grp, eio_req *req) 2387eio_grp_add (eio_req *grp, eio_req *req)
2731{ 2388{
2732 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2)); 2389 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
2733 2390
2734 grp->flags |= EIO_FLAG_GROUPADD; 2391 grp->flags |= ETP_FLAG_GROUPADD;
2735 2392
2736 ++grp->size; 2393 ++grp->size;
2737 req->grp = grp; 2394 req->grp = grp;
2738 2395
2739 req->grp_prev = 0; 2396 req->grp_prev = 0;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines