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

Comparing libeio/eio.c (file contents):
Revision 1.96 by root, Tue Jul 19 05:20:36 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 <signal.h> 238 #include <signal.h>
170 #include <dirent.h> 239 #include <dirent.h>
171 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
249
172 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES 250 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
173 #include <sys/mman.h> 251 #include <sys/mman.h>
174 #endif 252 #endif
175 253
176 #define D_NAME(entp) entp->d_name 254 #define D_NAME(entp) entp->d_name
177 255
178 /* 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 */
179 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 257 #if __FreeBSD__ || __NetBSD__ || __OpenBSD__
180 #define _DIRENT_HAVE_D_TYPE /* sigh */ 258 #define _DIRENT_HAVE_D_TYPE /* sigh */
181 #define D_INO(de) (de)->d_fileno 259 #define D_INO(de) (de)->d_fileno
182 #define D_NAMLEN(de) (de)->d_namlen 260 #define D_NAMLEN(de) (de)->d_namlen
183 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600 261 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
184 #define D_INO(de) (de)->d_ino 262 #define D_INO(de) (de)->d_ino
199 277
200#endif 278#endif
201 279
202#if HAVE_UTIMES 280#if HAVE_UTIMES
203# include <utime.h> 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>
204#endif 290#endif
205 291
206#if HAVE_SENDFILE 292#if HAVE_SENDFILE
207# if __linux 293# if __linux
208# include <sys/sendfile.h> 294# include <sys/sendfile.h>
239#endif 325#endif
240 326
241/* buffer size for various temporary buffers */ 327/* buffer size for various temporary buffers */
242#define EIO_BUFSIZE 65536 328#define EIO_BUFSIZE 65536
243 329
244#define dBUF \ 330#define dBUF \
245 char *eio_buf = malloc (EIO_BUFSIZE); \ 331 char *eio_buf = malloc (EIO_BUFSIZE); \
246 errno = ENOMEM; \ 332 errno = ENOMEM; \
247 if (!eio_buf) \ 333 if (!eio_buf) \
248 return -1 334 return -1
249 335
250#define FUBd \ 336#define FUBd \
251 free (eio_buf) 337 free (eio_buf)
252 338
253#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/*****************************************************************************/
254 364
255#define ETP_PRI_MIN EIO_PRI_MIN 365#define ETP_PRI_MIN EIO_PRI_MIN
256#define ETP_PRI_MAX EIO_PRI_MAX 366#define ETP_PRI_MAX EIO_PRI_MAX
257 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
258struct etp_worker; 378struct etp_worker;
259
260#define ETP_REQ eio_req 379#define ETP_REQ eio_req
261#define ETP_DESTROY(req) eio_destroy (req) 380#define ETP_DESTROY(req) eio_destroy (req)
262static int eio_finish (eio_req *req); 381static int eio_finish (eio_req *req);
263#define ETP_FINISH(req) eio_finish (req) 382#define ETP_FINISH(req) eio_finish (req)
264static void eio_execute (struct etp_worker *self, eio_req *req); 383static void eio_execute (struct etp_worker *self, eio_req *req);
265#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 384#define ETP_EXECUTE(wrk,req) eio_execute (wrk, req)
266 385
267/*****************************************************************************/ 386#include "etp.c"
268 387
269#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 388static struct etp_pool eio_pool;
270 389#define EIO_POOL (&eio_pool)
271/* calculate time difference in ~1/EIO_TICKS of a second */
272ecb_inline int
273tvdiff (struct timeval *tv1, struct timeval *tv2)
274{
275 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
276 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
277}
278
279static unsigned int started, idle, wanted = 4;
280
281static void (*want_poll_cb) (void);
282static void (*done_poll_cb) (void);
283
284static unsigned int max_poll_time; /* reslock */
285static unsigned int max_poll_reqs; /* reslock */
286
287static volatile unsigned int nreqs; /* reqlock */
288static volatile unsigned int nready; /* reqlock */
289static volatile unsigned int npending; /* reqlock */
290static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
291static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
292
293static xmutex_t wrklock;
294static xmutex_t reslock;
295static xmutex_t reqlock;
296static xcond_t reqwait;
297
298#if !HAVE_PREADWRITE
299/*
300 * make our pread/pwrite emulation safe against themselves, but not against
301 * normal read/write by using a mutex. slows down execution a lot,
302 * but that's your problem, not mine.
303 */
304static xmutex_t preadwritelock;
305#endif
306
307typedef struct etp_worker
308{
309 /* locked by wrklock */
310 struct etp_worker *prev, *next;
311
312 xthread_t tid;
313
314 /* locked by reslock, reqlock or wrklock */
315 ETP_REQ *req; /* currently processed request */
316
317#ifdef ETP_WORKER_COMMON
318 ETP_WORKER_COMMON
319#endif
320} etp_worker;
321
322static etp_worker wrk_first; /* NOT etp */
323
324#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
325#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
326
327/* worker threads management */
328
329static void ecb_cold
330etp_worker_clear (etp_worker *wrk)
331{
332}
333
334static void ecb_cold
335etp_worker_free (etp_worker *wrk)
336{
337 wrk->next->prev = wrk->prev;
338 wrk->prev->next = wrk->next;
339
340 free (wrk);
341}
342
343static unsigned int
344etp_nreqs (void)
345{
346 int retval;
347 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
348 retval = nreqs;
349 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
350 return retval;
351}
352
353static unsigned int
354etp_nready (void)
355{
356 unsigned int retval;
357
358 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
359 retval = nready;
360 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
361
362 return retval;
363}
364
365static unsigned int
366etp_npending (void)
367{
368 unsigned int retval;
369
370 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
371 retval = npending;
372 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
373
374 return retval;
375}
376
377static unsigned int
378etp_nthreads (void)
379{
380 unsigned int retval;
381
382 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
383 retval = started;
384 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
385
386 return retval;
387}
388
389/*
390 * a somewhat faster data structure might be nice, but
391 * with 8 priorities this actually needs <20 insns
392 * per shift, the most expensive operation.
393 */
394typedef struct {
395 ETP_REQ *qs[ETP_NUM_PRI], *qe[ETP_NUM_PRI]; /* qstart, qend */
396 int size;
397} etp_reqq;
398
399static etp_reqq req_queue;
400static etp_reqq res_queue;
401
402static void ecb_noinline ecb_cold
403reqq_init (etp_reqq *q)
404{
405 int pri;
406
407 for (pri = 0; pri < ETP_NUM_PRI; ++pri)
408 q->qs[pri] = q->qe[pri] = 0;
409
410 q->size = 0;
411}
412
413static int ecb_noinline
414reqq_push (etp_reqq *q, ETP_REQ *req)
415{
416 int pri = req->pri;
417 req->next = 0;
418
419 if (q->qe[pri])
420 {
421 q->qe[pri]->next = req;
422 q->qe[pri] = req;
423 }
424 else
425 q->qe[pri] = q->qs[pri] = req;
426
427 return q->size++;
428}
429
430static ETP_REQ * ecb_noinline
431reqq_shift (etp_reqq *q)
432{
433 int pri;
434
435 if (!q->size)
436 return 0;
437
438 --q->size;
439
440 for (pri = ETP_NUM_PRI; pri--; )
441 {
442 eio_req *req = q->qs[pri];
443
444 if (req)
445 {
446 if (!(q->qs[pri] = (eio_req *)req->next))
447 q->qe[pri] = 0;
448
449 return req;
450 }
451 }
452
453 abort ();
454}
455
456static int ecb_cold
457etp_init (void (*want_poll)(void), void (*done_poll)(void))
458{
459 X_MUTEX_CREATE (wrklock);
460 X_MUTEX_CREATE (reslock);
461 X_MUTEX_CREATE (reqlock);
462 X_COND_CREATE (reqwait);
463
464 reqq_init (&req_queue);
465 reqq_init (&res_queue);
466
467 wrk_first.next =
468 wrk_first.prev = &wrk_first;
469
470 started = 0;
471 idle = 0;
472 nreqs = 0;
473 nready = 0;
474 npending = 0;
475
476 want_poll_cb = want_poll;
477 done_poll_cb = done_poll;
478
479 return 0;
480}
481
482X_THREAD_PROC (etp_proc);
483
484static void ecb_cold
485etp_start_thread (void)
486{
487 etp_worker *wrk = calloc (1, sizeof (etp_worker));
488
489 /*TODO*/
490 assert (("unable to allocate worker thread data", wrk));
491
492 X_LOCK (wrklock);
493
494 if (thread_create (&wrk->tid, etp_proc, (void *)wrk))
495 {
496 wrk->prev = &wrk_first;
497 wrk->next = wrk_first.next;
498 wrk_first.next->prev = wrk;
499 wrk_first.next = wrk;
500 ++started;
501 }
502 else
503 free (wrk);
504
505 X_UNLOCK (wrklock);
506}
507
508static void
509etp_maybe_start_thread (void)
510{
511 if (ecb_expect_true (etp_nthreads () >= wanted))
512 return;
513
514 /* todo: maybe use idle here, but might be less exact */
515 if (ecb_expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
516 return;
517
518 etp_start_thread ();
519}
520
521static void ecb_cold
522etp_end_thread (void)
523{
524 eio_req *req = calloc (1, sizeof (eio_req));
525
526 req->type = -1;
527 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
528
529 X_LOCK (reqlock);
530 reqq_push (&req_queue, req);
531 X_COND_SIGNAL (reqwait);
532 X_UNLOCK (reqlock);
533
534 X_LOCK (wrklock);
535 --started;
536 X_UNLOCK (wrklock);
537}
538
539static int
540etp_poll (void)
541{
542 unsigned int maxreqs;
543 unsigned int maxtime;
544 struct timeval tv_start, tv_now;
545
546 X_LOCK (reslock);
547 maxreqs = max_poll_reqs;
548 maxtime = max_poll_time;
549 X_UNLOCK (reslock);
550
551 if (maxtime)
552 gettimeofday (&tv_start, 0);
553
554 for (;;)
555 {
556 ETP_REQ *req;
557
558 etp_maybe_start_thread ();
559
560 X_LOCK (reslock);
561 req = reqq_shift (&res_queue);
562
563 if (req)
564 {
565 --npending;
566
567 if (!res_queue.size && done_poll_cb)
568 done_poll_cb ();
569 }
570
571 X_UNLOCK (reslock);
572
573 if (!req)
574 return 0;
575
576 X_LOCK (reqlock);
577 --nreqs;
578 X_UNLOCK (reqlock);
579
580 if (ecb_expect_false (req->type == EIO_GROUP && req->size))
581 {
582 req->int1 = 1; /* mark request as delayed */
583 continue;
584 }
585 else
586 {
587 int res = ETP_FINISH (req);
588 if (ecb_expect_false (res))
589 return res;
590 }
591
592 if (ecb_expect_false (maxreqs && !--maxreqs))
593 break;
594
595 if (maxtime)
596 {
597 gettimeofday (&tv_now, 0);
598
599 if (tvdiff (&tv_start, &tv_now) >= maxtime)
600 break;
601 }
602 }
603
604 errno = EAGAIN;
605 return -1;
606}
607
608static void
609etp_cancel (ETP_REQ *req)
610{
611 req->cancelled = 1;
612
613 eio_grp_cancel (req);
614}
615
616static void
617etp_submit (ETP_REQ *req)
618{
619 req->pri -= ETP_PRI_MIN;
620
621 if (ecb_expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
622 if (ecb_expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
623
624 if (ecb_expect_false (req->type == EIO_GROUP))
625 {
626 /* I hope this is worth it :/ */
627 X_LOCK (reqlock);
628 ++nreqs;
629 X_UNLOCK (reqlock);
630
631 X_LOCK (reslock);
632
633 ++npending;
634
635 if (!reqq_push (&res_queue, req) && want_poll_cb)
636 want_poll_cb ();
637
638 X_UNLOCK (reslock);
639 }
640 else
641 {
642 X_LOCK (reqlock);
643 ++nreqs;
644 ++nready;
645 reqq_push (&req_queue, req);
646 X_COND_SIGNAL (reqwait);
647 X_UNLOCK (reqlock);
648
649 etp_maybe_start_thread ();
650 }
651}
652
653static void ecb_cold
654etp_set_max_poll_time (double nseconds)
655{
656 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
657 max_poll_time = nseconds * EIO_TICKS;
658 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
659}
660
661static void ecb_cold
662etp_set_max_poll_reqs (unsigned int maxreqs)
663{
664 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
665 max_poll_reqs = maxreqs;
666 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
667}
668
669static void ecb_cold
670etp_set_max_idle (unsigned int nthreads)
671{
672 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
673 max_idle = nthreads;
674 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
675}
676
677static void ecb_cold
678etp_set_idle_timeout (unsigned int seconds)
679{
680 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
681 idle_timeout = seconds;
682 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
683}
684
685static void ecb_cold
686etp_set_min_parallel (unsigned int nthreads)
687{
688 if (wanted < nthreads)
689 wanted = nthreads;
690}
691
692static void ecb_cold
693etp_set_max_parallel (unsigned int nthreads)
694{
695 if (wanted > nthreads)
696 wanted = nthreads;
697
698 while (started > wanted)
699 etp_end_thread ();
700}
701 390
702/*****************************************************************************/ 391/*****************************************************************************/
703 392
704static void 393static void
705grp_try_feed (eio_req *grp) 394grp_try_feed (eio_req *grp)
706{ 395{
707 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 396 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
708 { 397 {
709 grp->flags &= ~EIO_FLAG_GROUPADD; 398 grp->flags &= ~ETP_FLAG_GROUPADD;
710 399
711 EIO_FEED (grp); 400 EIO_FEED (grp);
712 401
713 /* stop if no progress has been made */ 402 /* stop if no progress has been made */
714 if (!(grp->flags & EIO_FLAG_GROUPADD)) 403 if (!(grp->flags & ETP_FLAG_GROUPADD))
715 { 404 {
716 grp->feed = 0; 405 grp->feed = 0;
717 break; 406 break;
718 } 407 }
719 } 408 }
726 415
727 /* call feeder, if applicable */ 416 /* call feeder, if applicable */
728 grp_try_feed (grp); 417 grp_try_feed (grp);
729 418
730 /* finish, if done */ 419 /* finish, if done */
731 if (!grp->size && grp->int1) 420 if (!grp->size && grp->flags & ETP_FLAG_DELAYED)
732 return eio_finish (grp); 421 return eio_finish (grp);
733 else 422 else
734 return 0; 423 return 0;
735} 424}
736 425
772} 461}
773 462
774void 463void
775eio_grp_cancel (eio_req *grp) 464eio_grp_cancel (eio_req *grp)
776{ 465{
777 for (grp = grp->grp_first; grp; grp = grp->grp_next) 466 etp_grp_cancel (EIO_POOL, grp);
778 eio_cancel (grp);
779} 467}
780 468
781void 469void
782eio_cancel (eio_req *req) 470eio_cancel (eio_req *req)
783{ 471{
784 etp_cancel (req); 472 etp_cancel (EIO_POOL, req);
785} 473}
786 474
787void 475void
788eio_submit (eio_req *req) 476eio_submit (eio_req *req)
789{ 477{
790 etp_submit (req); 478 etp_submit (EIO_POOL, req);
791} 479}
792 480
793unsigned int 481unsigned int
794eio_nreqs (void) 482eio_nreqs (void)
795{ 483{
796 return etp_nreqs (); 484 return etp_nreqs (EIO_POOL);
797} 485}
798 486
799unsigned int 487unsigned int
800eio_nready (void) 488eio_nready (void)
801{ 489{
802 return etp_nready (); 490 return etp_nready (EIO_POOL);
803} 491}
804 492
805unsigned int 493unsigned int
806eio_npending (void) 494eio_npending (void)
807{ 495{
808 return etp_npending (); 496 return etp_npending (EIO_POOL);
809} 497}
810 498
811unsigned int ecb_cold 499unsigned int ecb_cold
812eio_nthreads (void) 500eio_nthreads (void)
813{ 501{
814 return etp_nthreads (); 502 return etp_nthreads (EIO_POOL);
815} 503}
816 504
817void ecb_cold 505void ecb_cold
818eio_set_max_poll_time (double nseconds) 506eio_set_max_poll_time (double nseconds)
819{ 507{
820 etp_set_max_poll_time (nseconds); 508 etp_set_max_poll_time (EIO_POOL, nseconds);
821} 509}
822 510
823void ecb_cold 511void ecb_cold
824eio_set_max_poll_reqs (unsigned int maxreqs) 512eio_set_max_poll_reqs (unsigned int maxreqs)
825{ 513{
826 etp_set_max_poll_reqs (maxreqs); 514 etp_set_max_poll_reqs (EIO_POOL, maxreqs);
827} 515}
828 516
829void ecb_cold 517void ecb_cold
830eio_set_max_idle (unsigned int nthreads) 518eio_set_max_idle (unsigned int nthreads)
831{ 519{
832 etp_set_max_idle (nthreads); 520 etp_set_max_idle (EIO_POOL, nthreads);
833} 521}
834 522
835void ecb_cold 523void ecb_cold
836eio_set_idle_timeout (unsigned int seconds) 524eio_set_idle_timeout (unsigned int seconds)
837{ 525{
838 etp_set_idle_timeout (seconds); 526 etp_set_idle_timeout (EIO_POOL, seconds);
839} 527}
840 528
841void ecb_cold 529void ecb_cold
842eio_set_min_parallel (unsigned int nthreads) 530eio_set_min_parallel (unsigned int nthreads)
843{ 531{
844 etp_set_min_parallel (nthreads); 532 etp_set_min_parallel (EIO_POOL, nthreads);
845} 533}
846 534
847void ecb_cold 535void ecb_cold
848eio_set_max_parallel (unsigned int nthreads) 536eio_set_max_parallel (unsigned int nthreads)
849{ 537{
850 etp_set_max_parallel (nthreads); 538 etp_set_max_parallel (EIO_POOL, nthreads);
851} 539}
852 540
853int eio_poll (void) 541int eio_poll (void)
854{ 542{
855 return etp_poll (); 543 return etp_poll (EIO_POOL);
856} 544}
857 545
858/*****************************************************************************/ 546/*****************************************************************************/
859/* work around various missing functions */ 547/* work around various missing functions */
860
861#if !HAVE_PREADWRITE
862# undef pread
863# undef pwrite
864# define pread eio__pread
865# define pwrite eio__pwrite
866
867static eio_ssize_t
868eio__pread (int fd, void *buf, size_t count, off_t offset)
869{
870 eio_ssize_t res;
871 off_t ooffset;
872
873 X_LOCK (preadwritelock);
874 ooffset = lseek (fd, 0, SEEK_CUR);
875 lseek (fd, offset, SEEK_SET);
876 res = read (fd, buf, count);
877 lseek (fd, ooffset, SEEK_SET);
878 X_UNLOCK (preadwritelock);
879
880 return res;
881}
882
883static eio_ssize_t
884eio__pwrite (int fd, void *buf, size_t count, off_t offset)
885{
886 eio_ssize_t res;
887 off_t ooffset;
888
889 X_LOCK (preadwritelock);
890 ooffset = lseek (fd, 0, SEEK_CUR);
891 lseek (fd, offset, SEEK_SET);
892 res = write (fd, buf, count);
893 lseek (fd, ooffset, SEEK_SET);
894 X_UNLOCK (preadwritelock);
895
896 return res;
897}
898#endif
899 548
900#ifndef HAVE_UTIMES 549#ifndef HAVE_UTIMES
901 550
902# undef utimes 551# undef utimes
903# define utimes(path,times) eio__utimes (path, times) 552# define utimes(path,times) eio__utimes (path, times)
936 585
937#if !HAVE_FDATASYNC 586#if !HAVE_FDATASYNC
938# undef fdatasync 587# undef fdatasync
939# define fdatasync(fd) fsync (fd) 588# define fdatasync(fd) fsync (fd)
940#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}
941 607
942/* sync_file_range always needs emulation */ 608/* sync_file_range always needs emulation */
943static int 609static int
944eio__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)
945{ 611{
968} 634}
969 635
970static int 636static int
971eio__fallocate (int fd, int mode, off_t offset, size_t len) 637eio__fallocate (int fd, int mode, off_t offset, size_t len)
972{ 638{
973#if HAVE_FALLOCATE 639#if HAVE_LINUX_FALLOCATE
974 return fallocate (fd, mode, offset, len); 640 return fallocate (fd, mode, offset, len);
975#else 641#else
976 errno = ENOSYS; 642 return EIO_ENOSYS ();
977 return -1;
978#endif 643#endif
979} 644}
980 645
981#if !HAVE_READAHEAD 646#if !HAVE_READAHEAD
982# undef readahead 647# undef readahead
997 todo -= len; 662 todo -= len;
998 } 663 }
999 664
1000 FUBd; 665 FUBd;
1001 666
1002 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 */
1003 return count; 669 return 0;
1004} 670}
1005 671
1006#endif 672#endif
1007 673
1008/* sendfile always needs emulation */ 674/* sendfile always needs emulation */
1043 709
1044 /* according to source inspection, this is correct, and useful behaviour */ 710 /* according to source inspection, this is correct, and useful behaviour */
1045 if (sbytes) 711 if (sbytes)
1046 res = sbytes; 712 res = sbytes;
1047 713
1048# elif defined (__APPLE__) 714# elif defined __APPLE__
1049 off_t sbytes = count; 715 off_t sbytes = count;
1050 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 716 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1051 717
1052 /* according to the manpage, sbytes is always valid */ 718 /* according to the manpage, sbytes is always valid */
1053 if (sbytes) 719 if (sbytes)
1080 HANDLE h = TO_SOCKET (ifd); 746 HANDLE h = TO_SOCKET (ifd);
1081 SetFilePointer (h, offset, 0, FILE_BEGIN); 747 SetFilePointer (h, offset, 0, FILE_BEGIN);
1082 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0); 748 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1083 749
1084#else 750#else
1085 res = -1; 751 res = EIO_ENOSYS ();
1086 errno = ENOSYS;
1087#endif 752#endif
1088 753
1089 /* we assume sendfile can copy at least 128mb in one go */ 754 /* we assume sendfile can copy at least 128mb in one go */
1090 if (res <= 128 * 1024 * 1024) 755 if (res <= 128 * 1024 * 1024)
1091 { 756 {
1278 943
1279/*****************************************************************************/ 944/*****************************************************************************/
1280/* requests implemented outside eio_execute, because they are so large */ 945/* requests implemented outside eio_execute, because they are so large */
1281 946
1282static void 947static void
1283eio__realpath (eio_req *req, etp_worker *self) 948eio__lseek (eio_req *req)
1284{ 949{
1285 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{
1286 char *res; 965 char *res;
966 const char *rel = path;
1287 char *tmp1, *tmp2; 967 char *tmp1, *tmp2;
1288#if SYMLOOP_MAX > 32 968#if SYMLOOP_MAX > 32
1289 int symlinks = SYMLOOP_MAX; 969 int symlinks = SYMLOOP_MAX;
1290#else 970#else
1291 int symlinks = 32; 971 int symlinks = 32;
1292#endif 972#endif
1293 973
1294 req->result = -1;
1295
1296 errno = EINVAL; 974 errno = EINVAL;
1297 if (!rel) 975 if (!rel)
1298 return; 976 return -1;
1299 977
1300 errno = ENOENT; 978 errno = ENOENT;
1301 if (!*rel) 979 if (!*rel)
1302 return; 980 return -1;
1303 981
1304 if (!req->ptr2) 982 res = etp_tmpbuf_get (tmpbuf, PATH_MAX * 3);
1305 { 983#ifdef _WIN32
1306 X_LOCK (wrklock); 984 if (_access (rel, 4) != 0)
1307 req->flags |= EIO_FLAG_PTR2_FREE;
1308 X_UNLOCK (wrklock);
1309 req->ptr2 = malloc (PATH_MAX * 3);
1310
1311 errno = ENOMEM;
1312 if (!req->ptr2)
1313 return; 985 return -1;
1314 }
1315 986
1316 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
1317 tmp1 = res + PATH_MAX; 1000 tmp1 = res + PATH_MAX;
1318 tmp2 = tmp1 + PATH_MAX; 1001 tmp2 = tmp1 + PATH_MAX;
1319 1002
1320#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 */
1321#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1004#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1325 1008
1326 if (fd >= 0) 1009 if (fd >= 0)
1327 { 1010 {
1328 sprintf (tmp1, "/proc/self/fd/%d", fd); 1011 sprintf (tmp1, "/proc/self/fd/%d", fd);
1329 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 */
1330 close (fd); 1014 close (fd);
1331
1332 /* here we should probably stat the open file and the disk file, to make sure they still match */
1333 1015
1334 if (req->result > 0) 1016 if (req->result > 0)
1335 goto done; 1017 goto done;
1336 } 1018 }
1337 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)
1338 return; 1020 return -1;
1339 } 1021 }
1340#endif 1022#endif
1341#endif 1023#endif
1342 1024
1343 if (*rel != '/') 1025 if (*rel != '/')
1344 { 1026 {
1027 int len;
1028
1029 errno = ENOENT;
1030 if (wd == EIO_INVALID_WD)
1031 return -1;
1032
1033 if (wd == EIO_CWD)
1034 {
1345 if (!getcwd (res, PATH_MAX)) 1035 if (!getcwd (res, PATH_MAX))
1346 return; 1036 return -1;
1037
1038 len = strlen (res);
1039 }
1040 else
1041 memcpy (res, wd->str, len = wd->len);
1347 1042
1348 if (res [1]) /* only use if not / */ 1043 if (res [1]) /* only use if not / */
1349 res += strlen (res); 1044 res += len;
1350 } 1045 }
1351 1046
1352 while (*rel) 1047 while (*rel)
1353 { 1048 {
1354 eio_ssize_t len, linklen; 1049 eio_ssize_t len, linklen;
1355 char *beg = rel; 1050 const char *beg = rel;
1356 1051
1357 while (*rel && *rel != '/') 1052 while (*rel && *rel != '/')
1358 ++rel; 1053 ++rel;
1359 1054
1360 len = rel - beg; 1055 len = rel - beg;
1372 1067
1373 if (beg [1] == '.' && len == 2) 1068 if (beg [1] == '.' && len == 2)
1374 { 1069 {
1375 /* .. - back up one component, if possible */ 1070 /* .. - back up one component, if possible */
1376 1071
1377 while (res != req->ptr2) 1072 while (res != tmpbuf->ptr)
1378 if (*--res == '/') 1073 if (*--res == '/')
1379 break; 1074 break;
1380 1075
1381 continue; 1076 continue;
1382 } 1077 }
1383 } 1078 }
1384 1079
1385 errno = ENAMETOOLONG; 1080 errno = ENAMETOOLONG;
1386 if (res + 1 + len + 1 >= tmp1) 1081 if (res + 1 + len + 1 >= tmp1)
1387 return; 1082 return -1;
1388 1083
1389 /* copy one component */ 1084 /* copy one component */
1390 *res = '/'; 1085 *res = '/';
1391 memcpy (res + 1, beg, len); 1086 memcpy (res + 1, beg, len);
1392 1087
1393 /* zero-terminate, for readlink */ 1088 /* zero-terminate, for readlink */
1394 res [len + 1] = 0; 1089 res [len + 1] = 0;
1395 1090
1396 /* now check if it's a symlink */ 1091 /* now check if it's a symlink */
1397 linklen = readlink (req->ptr2, tmp1, PATH_MAX); 1092 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1398 1093
1399 if (linklen < 0) 1094 if (linklen < 0)
1400 { 1095 {
1401 if (errno != EINVAL) 1096 if (errno != EINVAL)
1402 return; 1097 return -1;
1403 1098
1404 /* it's a normal directory. hopefully */ 1099 /* it's a normal directory. hopefully */
1405 res += len + 1; 1100 res += len + 1;
1406 } 1101 }
1407 else 1102 else
1409 /* yay, it was a symlink - build new path in tmp2 */ 1104 /* yay, it was a symlink - build new path in tmp2 */
1410 int rellen = strlen (rel); 1105 int rellen = strlen (rel);
1411 1106
1412 errno = ENAMETOOLONG; 1107 errno = ENAMETOOLONG;
1413 if (linklen + 1 + rellen >= PATH_MAX) 1108 if (linklen + 1 + rellen >= PATH_MAX)
1414 return; 1109 return -1;
1415 1110
1416 errno = ELOOP; 1111 errno = ELOOP;
1417 if (!--symlinks) 1112 if (!--symlinks)
1418 return; 1113 return -1;
1419 1114
1420 if (*tmp1 == '/') 1115 if (*tmp1 == '/')
1421 res = req->ptr2; /* symlink resolves to an absolute path */ 1116 res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1422 1117
1423 /* 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 */
1424 memmove (tmp2 + linklen + 1, rel, rellen + 1); 1119 memmove (tmp2 + linklen + 1, rel, rellen + 1);
1425 tmp2 [linklen] = '/'; 1120 tmp2 [linklen] = '/';
1426 memcpy (tmp2, tmp1, linklen); 1121 memcpy (tmp2, tmp1, linklen);
1428 rel = tmp2; 1123 rel = tmp2;
1429 } 1124 }
1430 } 1125 }
1431 1126
1432 /* special case for the lone root path */ 1127 /* special case for the lone root path */
1433 if (res == req->ptr2) 1128 if (res == tmpbuf->ptr)
1434 *res++ = '/'; 1129 *res++ = '/';
1435 1130
1436 req->result = res - (char *)req->ptr2; 1131 return res - (char *)tmpbuf->ptr;
1437 1132#endif
1438done:
1439 req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1440} 1133}
1441 1134
1442static signed char 1135static signed char
1443eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1136eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1444{ 1137{
1632#ifdef _WIN32 1325#ifdef _WIN32
1633 { 1326 {
1634 int len = strlen ((const char *)req->ptr1); 1327 int len = strlen ((const char *)req->ptr1);
1635 char *path = malloc (MAX_PATH); 1328 char *path = malloc (MAX_PATH);
1636 const char *fmt; 1329 const char *fmt;
1330 const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1637 1331
1638 if (!len) 1332 if (!len)
1639 fmt = "./*"; 1333 fmt = "./*";
1640 else if (((const char *)req->ptr1)[len - 1] == '/' || ((const char *)req->ptr1)[len - 1] == '\\') 1334 else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1641 fmt = "%s*"; 1335 fmt = "%s*";
1642 else 1336 else
1643 fmt = "%s/*"; 1337 fmt = "%s/*";
1644 1338
1645 _snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1); 1339 _snprintf (path, MAX_PATH, fmt, reqpath);
1646 dirp = FindFirstFile (path, &entp); 1340 dirp = FindFirstFile (path, &entp);
1647 free (path); 1341 free (path);
1648 1342
1649 if (dirp == INVALID_HANDLE_VALUE) 1343 if (dirp == INVALID_HANDLE_VALUE)
1650 { 1344 {
1651 dirp = 0; 1345 /* should steal _dosmaperr */
1652
1653 switch (GetLastError ()) 1346 switch (GetLastError ())
1654 { 1347 {
1655 case ERROR_FILE_NOT_FOUND: 1348 case ERROR_FILE_NOT_FOUND:
1656 req->result = 0; 1349 req->result = 0;
1657 break; 1350 break;
1658 1351
1659 case ERROR_INVALID_NAME: 1352 case ERROR_INVALID_NAME:
1660 case ERROR_PATH_NOT_FOUND: 1353 case ERROR_PATH_NOT_FOUND:
1661 case ERROR_NO_MORE_FILES: 1354 case ERROR_NO_MORE_FILES:
1662 errno = ENOENT; 1355 errno = ENOENT;
1663 break; 1356 break;
1664 1357
1665 case ERROR_NOT_ENOUGH_MEMORY: 1358 case ERROR_NOT_ENOUGH_MEMORY:
1666 errno = ENOMEM; 1359 errno = ENOMEM;
1667 break; 1360 break;
1668 1361
1669 default: 1362 default:
1670 errno = EINVAL; 1363 errno = EINVAL;
1671 break; 1364 break;
1672 } 1365 }
1366
1367 return;
1673 } 1368 }
1674 } 1369 }
1675#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
1676 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;
1677#endif 1392#endif
1678 1393
1679 if (req->flags & EIO_FLAG_PTR1_FREE) 1394 if (req->flags & EIO_FLAG_PTR1_FREE)
1680 free (req->ptr1); 1395 free (req->ptr1);
1681 1396
1682 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1397 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1683 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1398 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1684 req->ptr2 = names = malloc (namesalloc); 1399 req->ptr2 = names = malloc (namesalloc);
1685 1400
1686 if (dirp && names && (!flags || dents)) 1401 if (!names || (flags && !dents))
1402 return;
1403
1687 for (;;) 1404 for (;;)
1688 { 1405 {
1689 int done; 1406 int done;
1690 1407
1691#ifdef _WIN32 1408#ifdef _WIN32
1692 done = !dirp; 1409 done = !dirp;
1693#else 1410#else
1694 errno = 0; 1411 errno = 0;
1695 entp = readdir (dirp); 1412 entp = readdir (dirp);
1696 done = !entp; 1413 done = !entp;
1697#endif 1414#endif
1698 1415
1699 if (done) 1416 if (done)
1700 { 1417 {
1701#ifndef _WIN32 1418#ifndef _WIN32
1702 int old_errno = errno; 1419 int old_errno = errno;
1703 closedir (dirp); 1420 closedir (dirp);
1704 errno = old_errno; 1421 errno = old_errno;
1705 1422
1706 if (errno) 1423 if (errno)
1707 break; 1424 break;
1708#endif 1425#endif
1709 1426
1710 /* sort etc. */ 1427 /* sort etc. */
1711 req->int1 = flags; 1428 req->int1 = flags;
1712 req->result = dentoffs; 1429 req->result = dentoffs;
1713 1430
1714 if (flags & EIO_READDIR_STAT_ORDER) 1431 if (flags & EIO_READDIR_STAT_ORDER)
1715 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);
1716 else if (flags & EIO_READDIR_DIRS_FIRST) 1433 else if (flags & EIO_READDIR_DIRS_FIRST)
1717 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1434 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1718 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 */
1719 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))
1720 { 1487 {
1721 /* 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
1722 eio_dirent *oth = dents + dentoffs; 1495 ent = dents + dentoffs;
1723 eio_dirent *dir = dents;
1724 1496
1725 /* 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 */
1726 /* by walking from both sides and swapping if necessary */ 1498 ent->namelen = len - 1;
1727 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)
1728 { 1559 {
1729 if (dir->type == EIO_DT_DIR) 1560 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1730 ++dir; 1561 ent->score = 1;
1731 else if ((--oth)->type == EIO_DT_DIR) 1562 else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1732 { 1563 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1733 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1734
1735 ++dir;
1736 }
1737 } 1564 }
1738 1565 else if (ent->type == EIO_DT_DIR)
1739 /* now sort the dirs only (dirs all have the same score) */ 1566 ent->score = 0;
1740 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1741 } 1567 }
1742
1743 break;
1744 }
1745
1746 /* now add the entry to our list(s) */
1747 name = D_NAME (entp);
1748
1749 /* skip . and .. entries */
1750 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1751 {
1752 int len = D_NAMLEN (entp) + 1;
1753
1754 while (ecb_expect_false (namesoffs + len > namesalloc))
1755 {
1756 namesalloc *= 2;
1757 req->ptr2 = names = realloc (names, namesalloc);
1758
1759 if (!names)
1760 break;
1761 } 1568 }
1762 1569
1763 memcpy (names + namesoffs, name, len);
1764
1765 if (dents)
1766 {
1767 struct eio_dirent *ent;
1768
1769 if (ecb_expect_false (dentoffs == dentalloc))
1770 {
1771 dentalloc *= 2;
1772 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1773
1774 if (!dents)
1775 break;
1776 }
1777
1778 ent = dents + dentoffs;
1779
1780 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1781 ent->namelen = len - 1;
1782 ent->inode = D_INO (entp);
1783
1784 inode_bits |= ent->inode;
1785
1786 switch (D_TYPE (entp))
1787 {
1788 default:
1789 ent->type = EIO_DT_UNKNOWN;
1790 flags |= EIO_READDIR_FOUND_UNKNOWN;
1791 break;
1792
1793 #ifdef DT_FIFO
1794 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1795 #endif
1796 #ifdef DT_CHR
1797 case DT_CHR: ent->type = EIO_DT_CHR; break;
1798 #endif
1799 #ifdef DT_MPC
1800 case DT_MPC: ent->type = EIO_DT_MPC; break;
1801 #endif
1802 #ifdef DT_DIR
1803 case DT_DIR: ent->type = EIO_DT_DIR; break;
1804 #endif
1805 #ifdef DT_NAM
1806 case DT_NAM: ent->type = EIO_DT_NAM; break;
1807 #endif
1808 #ifdef DT_BLK
1809 case DT_BLK: ent->type = EIO_DT_BLK; break;
1810 #endif
1811 #ifdef DT_MPB
1812 case DT_MPB: ent->type = EIO_DT_MPB; break;
1813 #endif
1814 #ifdef DT_REG
1815 case DT_REG: ent->type = EIO_DT_REG; break;
1816 #endif
1817 #ifdef DT_NWK
1818 case DT_NWK: ent->type = EIO_DT_NWK; break;
1819 #endif
1820 #ifdef DT_CMP
1821 case DT_CMP: ent->type = EIO_DT_CMP; break;
1822 #endif
1823 #ifdef DT_LNK
1824 case DT_LNK: ent->type = EIO_DT_LNK; break;
1825 #endif
1826 #ifdef DT_SOCK
1827 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1828 #endif
1829 #ifdef DT_DOOR
1830 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1831 #endif
1832 #ifdef DT_WHT
1833 case DT_WHT: ent->type = EIO_DT_WHT; break;
1834 #endif
1835 }
1836
1837 ent->score = 7;
1838
1839 if (flags & EIO_READDIR_DIRS_FIRST)
1840 {
1841 if (ent->type == EIO_DT_UNKNOWN)
1842 {
1843 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1844 ent->score = 1;
1845 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1846 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1847 }
1848 else if (ent->type == EIO_DT_DIR)
1849 ent->score = 0;
1850 }
1851 }
1852
1853 namesoffs += len; 1570 namesoffs += len;
1854 ++dentoffs; 1571 ++dentoffs;
1855 } 1572 }
1856 1573
1857 if (EIO_CANCELLED (req)) 1574 if (EIO_CANCELLED (req))
1858 { 1575 {
1859 errno = ECANCELED; 1576 errno = ECANCELED;
1860 break; 1577 break;
1861 } 1578 }
1862 1579
1863#ifdef _WIN32 1580#ifdef _WIN32
1864 if (!FindNextFile (dirp, &entp)) 1581 if (!FindNextFile (dirp, &entp))
1865 { 1582 {
1866 FindClose (dirp); 1583 FindClose (dirp);
1867 dirp = 0; 1584 dirp = 0;
1868 } 1585 }
1869#endif 1586#endif
1870 } 1587 }
1871} 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
1872 1711
1873/*****************************************************************************/ 1712/*****************************************************************************/
1874 1713
1875#define ALLOC(len) \ 1714#define ALLOC(len) \
1876 if (!req->ptr2) \ 1715 if (!req->ptr2) \
1877 { \ 1716 { \
1878 X_LOCK (wrklock); \ 1717 X_LOCK (EIO_POOL->wrklock); \
1879 req->flags |= EIO_FLAG_PTR2_FREE; \ 1718 req->flags |= EIO_FLAG_PTR2_FREE; \
1880 X_UNLOCK (wrklock); \ 1719 X_UNLOCK (EIO_POOL->wrklock); \
1881 req->ptr2 = malloc (len); \ 1720 req->ptr2 = malloc (len); \
1882 if (!req->ptr2) \ 1721 if (!req->ptr2) \
1883 { \ 1722 { \
1884 errno = ENOMEM; \ 1723 errno = ENOMEM; \
1885 req->result = -1; \ 1724 req->result = -1; \
1886 break; \ 1725 break; \
1887 } \ 1726 } \
1888 } 1727 }
1889 1728
1890X_THREAD_PROC (etp_proc)
1891{
1892 ETP_REQ *req;
1893 struct timespec ts;
1894 etp_worker *self = (etp_worker *)thr_arg;
1895
1896 /* try to distribute timeouts somewhat evenly */
1897 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1898
1899 for (;;)
1900 {
1901 ts.tv_sec = 0;
1902
1903 X_LOCK (reqlock);
1904
1905 for (;;)
1906 {
1907 self->req = req = reqq_shift (&req_queue);
1908
1909 if (req)
1910 break;
1911
1912 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
1913 {
1914 X_UNLOCK (reqlock);
1915 X_LOCK (wrklock);
1916 --started;
1917 X_UNLOCK (wrklock);
1918 goto quit;
1919 }
1920
1921 ++idle;
1922
1923 if (idle <= max_idle)
1924 /* we are allowed to idle, so do so without any timeout */
1925 X_COND_WAIT (reqwait, reqlock);
1926 else
1927 {
1928 /* initialise timeout once */
1929 if (!ts.tv_sec)
1930 ts.tv_sec = time (0) + idle_timeout;
1931
1932 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1933 ts.tv_sec = 1; /* assuming this is not a value computed above.,.. */
1934 }
1935
1936 --idle;
1937 }
1938
1939 --nready;
1940
1941 X_UNLOCK (reqlock);
1942
1943 if (req->type < 0)
1944 goto quit;
1945
1946 ETP_EXECUTE (self, req);
1947
1948 X_LOCK (reslock);
1949
1950 ++npending;
1951
1952 if (!reqq_push (&res_queue, req) && want_poll_cb)
1953 want_poll_cb ();
1954
1955 self->req = 0;
1956 etp_worker_clear (self);
1957
1958 X_UNLOCK (reslock);
1959 }
1960
1961quit:
1962 X_LOCK (wrklock);
1963 etp_worker_free (self);
1964 X_UNLOCK (wrklock);
1965
1966 return 0;
1967}
1968
1969/*****************************************************************************/ 1729/*****************************************************************************/
1970 1730
1971int ecb_cold 1731int ecb_cold
1972eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1732eio_init (void (*want_poll)(void), void (*done_poll)(void))
1973{ 1733{
1974#if !HAVE_PREADWRITE 1734 eio_want_poll_cb = want_poll;
1975 X_MUTEX_CREATE (preadwritelock); 1735 eio_done_poll_cb = done_poll;
1976#endif
1977 1736
1978 return etp_init (want_poll, done_poll); 1737 return etp_init (EIO_POOL, 0, 0, 0);
1979} 1738}
1980 1739
1981ecb_inline void 1740ecb_inline void
1982eio_api_destroy (eio_req *req) 1741eio_api_destroy (eio_req *req)
1983{ 1742{
1984 free (req); 1743 free (req);
1985} 1744}
1986 1745
1987#define REQ(rtype) \ 1746#define REQ(rtype) \
1988 eio_req *req; \ 1747 eio_req *req; \
1989 \ 1748 \
1990 req = (eio_req *)calloc (1, sizeof *req); \ 1749 req = (eio_req *)calloc (1, sizeof *req); \
1991 if (!req) \ 1750 if (!req) \
1992 return 0; \ 1751 return 0; \
2006 { \ 1765 { \
2007 eio_api_destroy (req); \ 1766 eio_api_destroy (req); \
2008 return 0; \ 1767 return 0; \
2009 } 1768 }
2010 1769
1770#define SINGLEDOT(ptr) (0[(char *)(ptr)] == '.' && !1[(char *)(ptr)])
1771
2011static void 1772static void
2012eio_execute (etp_worker *self, eio_req *req) 1773eio_execute (etp_worker *self, eio_req *req)
2013{ 1774{
1775#if HAVE_AT
1776 int dirfd;
1777#else
1778 const char *path;
1779#endif
1780
2014 if (ecb_expect_false (EIO_CANCELLED (req))) 1781 if (ecb_expect_false (EIO_CANCELLED (req)))
2015 { 1782 {
2016 req->result = -1; 1783 req->result = -1;
2017 req->errorno = ECANCELED; 1784 req->errorno = ECANCELED;
2018 return; 1785 return;
2019 } 1786 }
2020 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
2021 switch (req->type) 1804 switch (req->type)
2022 { 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;
2023 case EIO_READ: ALLOC (req->size); 1813 case EIO_READ: ALLOC (req->size);
2024 req->result = req->offs >= 0 1814 req->result = req->offs >= 0
2025 ? pread (req->int1, req->ptr2, req->size, req->offs) 1815 ? pread (req->int1, req->ptr2, req->size, req->offs)
2026 : read (req->int1, req->ptr2, req->size); break; 1816 : read (req->int1, req->ptr2, req->size); break;
2027 case EIO_WRITE: req->result = req->offs >= 0 1817 case EIO_WRITE: req->result = req->offs >= 0
2029 : write (req->int1, req->ptr2, req->size); break; 1819 : write (req->int1, req->ptr2, req->size); break;
2030 1820
2031 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;
2032 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;
2033 1823
1824#if HAVE_AT
1825
2034 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1826 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2035 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;
2036 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));
2037 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
2038 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1932 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2039 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 1933 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
2040 1934
2041 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2042 req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2043 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 1935 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2044 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 1936 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2045 1937
2046 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
2047 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;
2048 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
2049 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;
2050 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
2051 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break; 1940 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2052 1941
2053 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
2054 case EIO_CLOSE: req->result = close (req->int1); break; 1942 case EIO_CLOSE: req->result = close (req->int1); break;
2055 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 1943 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
2056 case EIO_UNLINK: req->result = unlink (req->ptr1); break;
2057 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
2058 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
2059 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
2060 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
2061 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
2062 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2063
2064 case EIO_REALPATH: eio__realpath (req, self); break;
2065
2066 case EIO_READLINK: ALLOC (PATH_MAX);
2067 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
2068
2069 case EIO_SYNC: req->result = 0; sync (); break; 1944 case EIO_SYNC: req->result = 0; sync (); break;
2070 case EIO_FSYNC: req->result = fsync (req->int1); break; 1945 case EIO_FSYNC: req->result = fsync (req->int1); break;
2071 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;
2072 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;
2073 case EIO_MTOUCH: req->result = eio__mtouch (req); break; 1950 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2074 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;
2075 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 1952 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2076 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2077 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;
2078 1954
2079 case EIO_READDIR: eio__scandir (req, self); break; 1955 case EIO_READDIR: eio__scandir (req, self); break;
2080 1956
2081 case EIO_BUSY: 1957 case EIO_BUSY:
2091 req->result = select (0, 0, 0, 0, &tv); 1967 req->result = select (0, 0, 0, 0, &tv);
2092 } 1968 }
2093#endif 1969#endif
2094 break; 1970 break;
2095 1971
2096 case EIO_UTIME: 1972#if 0
2097 case EIO_FUTIME:
2098 {
2099 struct timeval tv[2];
2100 struct timeval *times;
2101
2102 if (req->nv1 != -1. || req->nv2 != -1.)
2103 {
2104 tv[0].tv_sec = req->nv1;
2105 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
2106 tv[1].tv_sec = req->nv2;
2107 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
2108
2109 times = tv;
2110 }
2111 else
2112 times = 0;
2113
2114 req->result = req->type == EIO_FUTIME
2115 ? futimes (req->int1, times)
2116 : utimes (req->ptr1, times);
2117 }
2118 break;
2119
2120 case EIO_GROUP: 1973 case EIO_GROUP:
2121 abort (); /* handled in eio_request */ 1974 abort (); /* handled in eio_request */
1975#endif
2122 1976
2123 case EIO_NOP: 1977 case EIO_NOP:
2124 req->result = 0; 1978 req->result = 0;
2125 break; 1979 break;
2126 1980
2127 case EIO_CUSTOM: 1981 case EIO_CUSTOM:
2128 req->feed (req); 1982 req->feed (req);
2129 break; 1983 break;
2130 1984
2131 default: 1985 default:
2132 errno = ENOSYS;
2133 req->result = -1; 1986 req->result = EIO_ENOSYS ();
2134 break; 1987 break;
2135 } 1988 }
2136 1989
2137 req->errorno = errno; 1990 req->errorno = errno;
2138} 1991}
2139 1992
2140#ifndef EIO_NO_WRAPPERS 1993#ifndef EIO_NO_WRAPPERS
2141 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
2142eio_req *eio_nop (int pri, eio_cb cb, void *data) 2005eio_req *eio_nop (int pri, eio_cb cb, void *data)
2143{ 2006{
2144 REQ (EIO_NOP); SEND; 2007 REQ (EIO_NOP); SEND;
2145} 2008}
2146 2009
2162eio_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)
2163{ 2026{
2164 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;
2165} 2028}
2166 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
2167eio_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)
2168{ 2046{
2169 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;
2170} 2048}
2171 2049
2177eio_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)
2178{ 2056{
2179 REQ (EIO_MLOCKALL); req->int1 = flags; SEND; 2057 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2180} 2058}
2181 2059
2182eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2183{
2184 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2185}
2186
2187eio_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)
2188{ 2061{
2189 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;
2190} 2063}
2191 2064
2192eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2193{
2194 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2195}
2196
2197eio_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)
2198{ 2066{
2199 REQ (EIO_CLOSE); req->int1 = fd; SEND; 2067 REQ (EIO_CLOSE); req->int1 = fd; SEND;
2200} 2068}
2201 2069
2202eio_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)
2203{ 2071{
2204 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;
2205} 2078}
2206 2079
2207eio_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)
2208{ 2081{
2209 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;
2407void 2280void
2408eio_grp_add (eio_req *grp, eio_req *req) 2281eio_grp_add (eio_req *grp, eio_req *req)
2409{ 2282{
2410 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));
2411 2284
2412 grp->flags |= EIO_FLAG_GROUPADD; 2285 grp->flags |= ETP_FLAG_GROUPADD;
2413 2286
2414 ++grp->size; 2287 ++grp->size;
2415 req->grp = grp; 2288 req->grp = grp;
2416 2289
2417 req->grp_prev = 0; 2290 req->grp_prev = 0;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines