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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines