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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines