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

Comparing libeio/eio.c (file contents):
Revision 1.90 by root, Sat Jul 16 16:46:10 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>
… …
71#endif 71#endif
72#ifndef ELOOP 72#ifndef ELOOP
73# define ELOOP EDOM 73# define ELOOP EDOM
74#endif 74#endif
75 75
76#if !defined(ENOTSOCK) && defined(WSAENOTSOCK)
77# define ENOTSOCK WSAENOTSOCK
78#endif
79
76static void eio_destroy (eio_req *req); 80static void eio_destroy (eio_req *req);
77 81
78#ifndef EIO_FINISH 82#ifndef EIO_FINISH
79# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0 83# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0
80#endif 84#endif
… …
101#ifdef _WIN32 105#ifdef _WIN32
102 106
103 #undef PAGESIZE 107 #undef PAGESIZE
104 #define PAGESIZE 4096 /* GetSystemInfo? */ 108 #define PAGESIZE 4096 /* GetSystemInfo? */
105 109
110 /* TODO: look at how perl does stat (non-sloppy), unlink (ro-files), utime, link */
111
106 #ifdef EIO_STRUCT_STATI64 112 #ifdef EIO_STRUCT_STATI64
113 /* look at perl's non-sloppy stat */
107 #define stat(path,buf) _stati64 (path,buf) 114 #define stat(path,buf) _stati64 (path,buf)
108 #define fstat(fd,buf) _fstati64 (path,buf) 115 #define fstat(fd,buf) _fstati64 (fd,buf)
109 #endif 116 #endif
110 #define lstat(path,buf) stat (path,buf) 117 #define lstat(path,buf) stat (path,buf)
111 #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))
112 #define mkdir(path,mode) _mkdir (path) 119 #define mkdir(path,mode) _mkdir (path)
113 #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))
114 121
115 #define chmod(path,mode) _chmod (path, mode) 122 #define chmod(path,mode) _chmod (path, mode)
123 #define dup(fd) _dup (fd)
124 #define dup2(fd1,fd2) _dup2 (fd1, fd2)
125 #define pipe(fds) _pipe (fds, 4096, O_BINARY)
126
116 #define fchmod(fd,mode) EIO_ENOSYS () 127 #define fchmod(fd,mode) EIO_ENOSYS ()
117 #define chown(path,uid,gid) EIO_ENOSYS () 128 #define chown(path,uid,gid) EIO_ENOSYS ()
118 #define fchown(fd,uid,gid) EIO_ENOSYS () 129 #define fchown(fd,uid,gid) EIO_ENOSYS ()
119 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */ 130 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
120 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */ 131 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
… …
122 #define sync() EIO_ENOSYS () 133 #define sync() EIO_ENOSYS ()
123 #define readlink(path,buf,s) EIO_ENOSYS () 134 #define readlink(path,buf,s) EIO_ENOSYS ()
124 #define statvfs(path,buf) EIO_ENOSYS () 135 #define statvfs(path,buf) EIO_ENOSYS ()
125 #define fstatvfs(fd,buf) EIO_ENOSYS () 136 #define fstatvfs(fd,buf) EIO_ENOSYS ()
126 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
127 /* we could even stat and see if it exists */ 204 /* we could even stat and see if it exists */
128 static int 205 static int
129 symlink (const char *old, const char *neu) 206 symlink (const char *old, const char *neu)
130 { 207 {
131 #if WINVER >= 0x0600 208 #if WINVER >= 0x0600
… …
137 #endif 214 #endif
138 215
139 return EIO_ERRNO (ENOENT, -1); 216 return EIO_ERRNO (ENOENT, -1);
140 } 217 }
141 218
142 /* POSIX API only */ 219 /* POSIX API only, causing trouble for win32 apps */
143 #define CreateHardLink(neu,old) 0 220 #define CreateHardLink(neu,old,flags) 0 /* not really creating hardlink, still using relative paths? */
144 #define CreateSymbolicLink(neu,old,flags) 0 221 #define CreateSymbolicLink(neu,old,flags) 0 /* vista+ only */
145 222
146 struct statvfs 223 struct statvfs
147 { 224 {
148 int dummy; 225 int dummy;
149 }; 226 };
150 227
228 #define DT_DIR EIO_DT_DIR
229 #define DT_REG EIO_DT_REG
230 #define D_NAME(entp) entp.cFileName
231 #define D_TYPE(entp) (entp.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? DT_DIR : DT_REG)
232
151#else 233#else
152 234
153 #include <sys/time.h> 235 #include <sys/time.h>
154 #include <sys/select.h> 236 #include <sys/select.h>
155 #include <sys/statvfs.h>
156 #include <unistd.h> 237 #include <unistd.h>
157 #include <utime.h>
158 #include <signal.h> 238 #include <signal.h>
159 #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
160 249
161 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES 250 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
162 #include <sys/mman.h> 251 #include <sys/mman.h>
163 #endif 252 #endif
164 253
254 #define D_NAME(entp) entp->d_name
255
165 /* 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 */
166 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 257 #if __FreeBSD__ || __NetBSD__ || __OpenBSD__
167 #define _DIRENT_HAVE_D_TYPE /* sigh */ 258 #define _DIRENT_HAVE_D_TYPE /* sigh */
168 #define D_INO(de) (de)->d_fileno 259 #define D_INO(de) (de)->d_fileno
169 #define D_NAMLEN(de) (de)->d_namlen 260 #define D_NAMLEN(de) (de)->d_namlen
170 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600 261 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
171 #define D_INO(de) (de)->d_ino 262 #define D_INO(de) (de)->d_ino
… …
182 273
183 #ifndef EIO_STRUCT_DIRENT 274 #ifndef EIO_STRUCT_DIRENT
184 #define EIO_STRUCT_DIRENT struct dirent 275 #define EIO_STRUCT_DIRENT struct dirent
185 #endif 276 #endif
186 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>
187#endif 290#endif
188 291
189#if HAVE_SENDFILE 292#if HAVE_SENDFILE
190# if __linux 293# if __linux
191# include <sys/sendfile.h> 294# include <sys/sendfile.h>
… …
206#endif 309#endif
207#ifndef D_INO 310#ifndef D_INO
208# define D_INO(de) 0 311# define D_INO(de) 0
209#endif 312#endif
210#ifndef D_NAMLEN 313#ifndef D_NAMLEN
211# define D_NAMLEN(de) strlen ((de)->d_name) 314# define D_NAMLEN(entp) strlen (D_NAME (entp))
212#endif 315#endif
213 316
214/* used for struct dirent, AIX doesn't provide it */ 317/* used for struct dirent, AIX doesn't provide it */
215#ifndef NAME_MAX 318#ifndef NAME_MAX
216# define NAME_MAX 4096 319# define NAME_MAX 4096
… …
222#endif 325#endif
223 326
224/* buffer size for various temporary buffers */ 327/* buffer size for various temporary buffers */
225#define EIO_BUFSIZE 65536 328#define EIO_BUFSIZE 65536
226 329
227#define dBUF \ 330#define dBUF \
228 char *eio_buf; \
229 ETP_WORKER_LOCK (self); \
230 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \ 331 char *eio_buf = malloc (EIO_BUFSIZE); \
231 ETP_WORKER_UNLOCK (self); \
232 errno = ENOMEM; \ 332 errno = ENOMEM; \
233 if (!eio_buf) \ 333 if (!eio_buf) \
234 return -1; 334 return -1
235 335
236#define EIO_TICKS ((1000000 + 1023) >> 10) 336#define FUBd \
337 free (eio_buf)
338
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/*****************************************************************************/
237 364
238#define ETP_PRI_MIN EIO_PRI_MIN 365#define ETP_PRI_MIN EIO_PRI_MIN
239#define ETP_PRI_MAX EIO_PRI_MAX 366#define ETP_PRI_MAX EIO_PRI_MAX
240 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
241struct etp_worker; 378struct etp_worker;
242
243#define ETP_REQ eio_req 379#define ETP_REQ eio_req
244#define ETP_DESTROY(req) eio_destroy (req) 380#define ETP_DESTROY(req) eio_destroy (req)
245static int eio_finish (eio_req *req); 381static int eio_finish (eio_req *req);
246#define ETP_FINISH(req) eio_finish (req) 382#define ETP_FINISH(req) eio_finish (req)
247static void eio_execute (struct etp_worker *self, eio_req *req); 383static void eio_execute (struct etp_worker *self, eio_req *req);
248#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 384#define ETP_EXECUTE(wrk,req) eio_execute (wrk, req)
249 385
250#define ETP_WORKER_CLEAR(req) \ 386#include "etp.c"
251 if (wrk->dbuf) \
252 { \
253 free (wrk->dbuf); \
254 wrk->dbuf = 0; \
255 } \
256 \
257 if (wrk->dirp) \
258 { \
259 closedir (wrk->dirp); \
260 wrk->dirp = 0; \
261 }
262 387
263#define ETP_WORKER_COMMON \ 388static struct etp_pool eio_pool;
264 void *dbuf; \ 389#define EIO_POOL (&eio_pool)
265 DIR *dirp;
266
267/*****************************************************************************/
268
269#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
270
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 = X_MUTEX_INIT;
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 ETP_WORKER_COMMON
318} etp_worker;
319
320static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */
321
322#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
323#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
324
325/* worker threads management */
326
327static void ecb_cold
328etp_worker_clear (etp_worker *wrk)
329{
330 ETP_WORKER_CLEAR (wrk);
331}
332
333static void ecb_cold
334etp_worker_free (etp_worker *wrk)
335{
336 wrk->next->prev = wrk->prev;
337 wrk->prev->next = wrk->next;
338
339 free (wrk);
340}
341
342static unsigned int
343etp_nreqs (void)
344{
345 int retval;
346 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
347 retval = nreqs;
348 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
349 return retval;
350}
351
352static unsigned int
353etp_nready (void)
354{
355 unsigned int retval;
356
357 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
358 retval = nready;
359 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
360
361 return retval;
362}
363
364static unsigned int
365etp_npending (void)
366{
367 unsigned int retval;
368
369 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
370 retval = npending;
371 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
372
373 return retval;
374}
375
376static unsigned int
377etp_nthreads (void)
378{
379 unsigned int retval;
380
381 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
382 retval = started;
383 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
384
385 return retval;
386}
387
388/*
389 * a somewhat faster data structure might be nice, but
390 * with 8 priorities this actually needs <20 insns
391 * per shift, the most expensive operation.
392 */
393typedef struct {
394 ETP_REQ *qs[ETP_NUM_PRI], *qe[ETP_NUM_PRI]; /* qstart, qend */
395 int size;
396} etp_reqq;
397
398static etp_reqq req_queue;
399static etp_reqq res_queue;
400
401static int ecb_noinline
402reqq_push (etp_reqq *q, ETP_REQ *req)
403{
404 int pri = req->pri;
405 req->next = 0;
406
407 if (q->qe[pri])
408 {
409 q->qe[pri]->next = req;
410 q->qe[pri] = req;
411 }
412 else
413 q->qe[pri] = q->qs[pri] = req;
414
415 return q->size++;
416}
417
418static ETP_REQ * ecb_noinline
419reqq_shift (etp_reqq *q)
420{
421 int pri;
422
423 if (!q->size)
424 return 0;
425
426 --q->size;
427
428 for (pri = ETP_NUM_PRI; pri--; )
429 {
430 eio_req *req = q->qs[pri];
431
432 if (req)
433 {
434 if (!(q->qs[pri] = (eio_req *)req->next))
435 q->qe[pri] = 0;
436
437 return req;
438 }
439 }
440
441 abort ();
442}
443
444static void ecb_cold
445etp_thread_init (void)
446{
447#if !HAVE_PREADWRITE
448 X_MUTEX_CREATE (preadwritelock);
449#endif
450 X_MUTEX_CREATE (wrklock);
451 X_MUTEX_CREATE (reslock);
452 X_MUTEX_CREATE (reqlock);
453 X_COND_CREATE (reqwait);
454}
455
456static void ecb_cold
457etp_atfork_prepare (void)
458{
459}
460
461static void ecb_cold
462etp_atfork_parent (void)
463{
464}
465
466static void ecb_cold
467etp_atfork_child (void)
468{
469 ETP_REQ *prv;
470
471 while ((prv = reqq_shift (&req_queue)))
472 ETP_DESTROY (prv);
473
474 while ((prv = reqq_shift (&res_queue)))
475 ETP_DESTROY (prv);
476
477 while (wrk_first.next != &wrk_first)
478 {
479 etp_worker *wrk = wrk_first.next;
480
481 if (wrk->req)
482 ETP_DESTROY (wrk->req);
483
484 etp_worker_clear (wrk);
485 etp_worker_free (wrk);
486 }
487
488 started = 0;
489 idle = 0;
490 nreqs = 0;
491 nready = 0;
492 npending = 0;
493
494 etp_thread_init ();
495}
496
497static void ecb_cold
498etp_once_init (void)
499{
500 etp_thread_init ();
501 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
502}
503
504static int ecb_cold
505etp_init (void (*want_poll)(void), void (*done_poll)(void))
506{
507 static pthread_once_t doinit = PTHREAD_ONCE_INIT;
508
509 pthread_once (&doinit, etp_once_init);
510
511 want_poll_cb = want_poll;
512 done_poll_cb = done_poll;
513
514 return 0;
515}
516
517X_THREAD_PROC (etp_proc);
518
519static void ecb_cold
520etp_start_thread (void)
521{
522 etp_worker *wrk = calloc (1, sizeof (etp_worker));
523
524 /*TODO*/
525 assert (("unable to allocate worker thread data", wrk));
526
527 X_LOCK (wrklock);
528
529 if (thread_create (&wrk->tid, etp_proc, (void *)wrk))
530 {
531 wrk->prev = &wrk_first;
532 wrk->next = wrk_first.next;
533 wrk_first.next->prev = wrk;
534 wrk_first.next = wrk;
535 ++started;
536 }
537 else
538 free (wrk);
539
540 X_UNLOCK (wrklock);
541}
542
543static void
544etp_maybe_start_thread (void)
545{
546 if (ecb_expect_true (etp_nthreads () >= wanted))
547 return;
548
549 /* todo: maybe use idle here, but might be less exact */
550 if (ecb_expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
551 return;
552
553 etp_start_thread ();
554}
555
556static void ecb_cold
557etp_end_thread (void)
558{
559 eio_req *req = calloc (1, sizeof (eio_req));
560
561 req->type = -1;
562 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
563
564 X_LOCK (reqlock);
565 reqq_push (&req_queue, req);
566 X_COND_SIGNAL (reqwait);
567 X_UNLOCK (reqlock);
568
569 X_LOCK (wrklock);
570 --started;
571 X_UNLOCK (wrklock);
572}
573
574static int
575etp_poll (void)
576{
577 unsigned int maxreqs;
578 unsigned int maxtime;
579 struct timeval tv_start, tv_now;
580
581 X_LOCK (reslock);
582 maxreqs = max_poll_reqs;
583 maxtime = max_poll_time;
584 X_UNLOCK (reslock);
585
586 if (maxtime)
587 gettimeofday (&tv_start, 0);
588
589 for (;;)
590 {
591 ETP_REQ *req;
592
593 etp_maybe_start_thread ();
594
595 X_LOCK (reslock);
596 req = reqq_shift (&res_queue);
597
598 if (req)
599 {
600 --npending;
601
602 if (!res_queue.size && done_poll_cb)
603 done_poll_cb ();
604 }
605
606 X_UNLOCK (reslock);
607
608 if (!req)
609 return 0;
610
611 X_LOCK (reqlock);
612 --nreqs;
613 X_UNLOCK (reqlock);
614
615 if (ecb_expect_false (req->type == EIO_GROUP && req->size))
616 {
617 req->int1 = 1; /* mark request as delayed */
618 continue;
619 }
620 else
621 {
622 int res = ETP_FINISH (req);
623 if (ecb_expect_false (res))
624 return res;
625 }
626
627 if (ecb_expect_false (maxreqs && !--maxreqs))
628 break;
629
630 if (maxtime)
631 {
632 gettimeofday (&tv_now, 0);
633
634 if (tvdiff (&tv_start, &tv_now) >= maxtime)
635 break;
636 }
637 }
638
639 errno = EAGAIN;
640 return -1;
641}
642
643static void
644etp_cancel (ETP_REQ *req)
645{
646 req->cancelled = 1;
647
648 eio_grp_cancel (req);
649}
650
651static void
652etp_submit (ETP_REQ *req)
653{
654 req->pri -= ETP_PRI_MIN;
655
656 if (ecb_expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
657 if (ecb_expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
658
659 if (ecb_expect_false (req->type == EIO_GROUP))
660 {
661 /* I hope this is worth it :/ */
662 X_LOCK (reqlock);
663 ++nreqs;
664 X_UNLOCK (reqlock);
665
666 X_LOCK (reslock);
667
668 ++npending;
669
670 if (!reqq_push (&res_queue, req) && want_poll_cb)
671 want_poll_cb ();
672
673 X_UNLOCK (reslock);
674 }
675 else
676 {
677 X_LOCK (reqlock);
678 ++nreqs;
679 ++nready;
680 reqq_push (&req_queue, req);
681 X_COND_SIGNAL (reqwait);
682 X_UNLOCK (reqlock);
683
684 etp_maybe_start_thread ();
685 }
686}
687
688static void ecb_cold
689etp_set_max_poll_time (double nseconds)
690{
691 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
692 max_poll_time = nseconds * EIO_TICKS;
693 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
694}
695
696static void ecb_cold
697etp_set_max_poll_reqs (unsigned int maxreqs)
698{
699 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
700 max_poll_reqs = maxreqs;
701 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
702}
703
704static void ecb_cold
705etp_set_max_idle (unsigned int nthreads)
706{
707 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
708 max_idle = nthreads;
709 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
710}
711
712static void ecb_cold
713etp_set_idle_timeout (unsigned int seconds)
714{
715 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
716 idle_timeout = seconds;
717 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
718}
719
720static void ecb_cold
721etp_set_min_parallel (unsigned int nthreads)
722{
723 if (wanted < nthreads)
724 wanted = nthreads;
725}
726
727static void ecb_cold
728etp_set_max_parallel (unsigned int nthreads)
729{
730 if (wanted > nthreads)
731 wanted = nthreads;
732
733 while (started > wanted)
734 etp_end_thread ();
735}
736 390
737/*****************************************************************************/ 391/*****************************************************************************/
738 392
739static void 393static void
740grp_try_feed (eio_req *grp) 394grp_try_feed (eio_req *grp)
741{ 395{
742 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 396 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
743 { 397 {
744 grp->flags &= ~EIO_FLAG_GROUPADD; 398 grp->flags &= ~ETP_FLAG_GROUPADD;
745 399
746 EIO_FEED (grp); 400 EIO_FEED (grp);
747 401
748 /* stop if no progress has been made */ 402 /* stop if no progress has been made */
749 if (!(grp->flags & EIO_FLAG_GROUPADD)) 403 if (!(grp->flags & ETP_FLAG_GROUPADD))
750 { 404 {
751 grp->feed = 0; 405 grp->feed = 0;
752 break; 406 break;
753 } 407 }
754 } 408 }
… …
761 415
762 /* call feeder, if applicable */ 416 /* call feeder, if applicable */
763 grp_try_feed (grp); 417 grp_try_feed (grp);
764 418
765 /* finish, if done */ 419 /* finish, if done */
766 if (!grp->size && grp->int1) 420 if (!grp->size && grp->flags & ETP_FLAG_DELAYED)
767 return eio_finish (grp); 421 return eio_finish (grp);
768 else 422 else
769 return 0; 423 return 0;
770} 424}
771 425
… …
807} 461}
808 462
809void 463void
810eio_grp_cancel (eio_req *grp) 464eio_grp_cancel (eio_req *grp)
811{ 465{
812 for (grp = grp->grp_first; grp; grp = grp->grp_next) 466 etp_grp_cancel (EIO_POOL, grp);
813 eio_cancel (grp);
814} 467}
815 468
816void 469void
817eio_cancel (eio_req *req) 470eio_cancel (eio_req *req)
818{ 471{
819 etp_cancel (req); 472 etp_cancel (EIO_POOL, req);
820} 473}
821 474
822void 475void
823eio_submit (eio_req *req) 476eio_submit (eio_req *req)
824{ 477{
825 etp_submit (req); 478 etp_submit (EIO_POOL, req);
826} 479}
827 480
828unsigned int 481unsigned int
829eio_nreqs (void) 482eio_nreqs (void)
830{ 483{
831 return etp_nreqs (); 484 return etp_nreqs (EIO_POOL);
832} 485}
833 486
834unsigned int 487unsigned int
835eio_nready (void) 488eio_nready (void)
836{ 489{
837 return etp_nready (); 490 return etp_nready (EIO_POOL);
838} 491}
839 492
840unsigned int 493unsigned int
841eio_npending (void) 494eio_npending (void)
842{ 495{
843 return etp_npending (); 496 return etp_npending (EIO_POOL);
844} 497}
845 498
846unsigned int ecb_cold 499unsigned int ecb_cold
847eio_nthreads (void) 500eio_nthreads (void)
848{ 501{
849 return etp_nthreads (); 502 return etp_nthreads (EIO_POOL);
850} 503}
851 504
852void ecb_cold 505void ecb_cold
853eio_set_max_poll_time (double nseconds) 506eio_set_max_poll_time (double nseconds)
854{ 507{
855 etp_set_max_poll_time (nseconds); 508 etp_set_max_poll_time (EIO_POOL, nseconds);
856} 509}
857 510
858void ecb_cold 511void ecb_cold
859eio_set_max_poll_reqs (unsigned int maxreqs) 512eio_set_max_poll_reqs (unsigned int maxreqs)
860{ 513{
861 etp_set_max_poll_reqs (maxreqs); 514 etp_set_max_poll_reqs (EIO_POOL, maxreqs);
862} 515}
863 516
864void ecb_cold 517void ecb_cold
865eio_set_max_idle (unsigned int nthreads) 518eio_set_max_idle (unsigned int nthreads)
866{ 519{
867 etp_set_max_idle (nthreads); 520 etp_set_max_idle (EIO_POOL, nthreads);
868} 521}
869 522
870void ecb_cold 523void ecb_cold
871eio_set_idle_timeout (unsigned int seconds) 524eio_set_idle_timeout (unsigned int seconds)
872{ 525{
873 etp_set_idle_timeout (seconds); 526 etp_set_idle_timeout (EIO_POOL, seconds);
874} 527}
875 528
876void ecb_cold 529void ecb_cold
877eio_set_min_parallel (unsigned int nthreads) 530eio_set_min_parallel (unsigned int nthreads)
878{ 531{
879 etp_set_min_parallel (nthreads); 532 etp_set_min_parallel (EIO_POOL, nthreads);
880} 533}
881 534
882void ecb_cold 535void ecb_cold
883eio_set_max_parallel (unsigned int nthreads) 536eio_set_max_parallel (unsigned int nthreads)
884{ 537{
885 etp_set_max_parallel (nthreads); 538 etp_set_max_parallel (EIO_POOL, nthreads);
886} 539}
887 540
888int eio_poll (void) 541int eio_poll (void)
889{ 542{
890 return etp_poll (); 543 return etp_poll (EIO_POOL);
891} 544}
892 545
893/*****************************************************************************/ 546/*****************************************************************************/
894/* work around various missing functions */ 547/* work around various missing functions */
895
896#if !HAVE_PREADWRITE
897# undef pread
898# undef pwrite
899# define pread eio__pread
900# define pwrite eio__pwrite
901
902static eio_ssize_t
903eio__pread (int fd, void *buf, size_t count, off_t offset)
904{
905 eio_ssize_t res;
906 off_t ooffset;
907
908 X_LOCK (preadwritelock);
909 ooffset = lseek (fd, 0, SEEK_CUR);
910 lseek (fd, offset, SEEK_SET);
911 res = read (fd, buf, count);
912 lseek (fd, ooffset, SEEK_SET);
913 X_UNLOCK (preadwritelock);
914
915 return res;
916}
917
918static eio_ssize_t
919eio__pwrite (int fd, void *buf, size_t count, off_t offset)
920{
921 eio_ssize_t res;
922 off_t ooffset;
923
924 X_LOCK (preadwritelock);
925 ooffset = lseek (fd, 0, SEEK_CUR);
926 lseek (fd, offset, SEEK_SET);
927 res = write (fd, buf, count);
928 lseek (fd, ooffset, SEEK_SET);
929 X_UNLOCK (preadwritelock);
930
931 return res;
932}
933#endif
934 548
935#ifndef HAVE_UTIMES 549#ifndef HAVE_UTIMES
936 550
937# undef utimes 551# undef utimes
938# define utimes(path,times) eio__utimes (path, times) 552# define utimes(path,times) eio__utimes (path, times)
… …
971 585
972#if !HAVE_FDATASYNC 586#if !HAVE_FDATASYNC
973# undef fdatasync 587# undef fdatasync
974# define fdatasync(fd) fsync (fd) 588# define fdatasync(fd) fsync (fd)
975#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}
976 607
977/* sync_file_range always needs emulation */ 608/* sync_file_range always needs emulation */
978static int 609static int
979eio__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)
980{ 611{
… …
1003} 634}
1004 635
1005static int 636static int
1006eio__fallocate (int fd, int mode, off_t offset, size_t len) 637eio__fallocate (int fd, int mode, off_t offset, size_t len)
1007{ 638{
1008#if HAVE_FALLOCATE 639#if HAVE_LINUX_FALLOCATE
1009 return fallocate (fd, mode, offset, len); 640 return fallocate (fd, mode, offset, len);
1010#else 641#else
1011 errno = ENOSYS; 642 return EIO_ENOSYS ();
1012 return -1;
1013#endif 643#endif
1014} 644}
1015 645
1016#if !HAVE_READAHEAD 646#if !HAVE_READAHEAD
1017# undef readahead 647# undef readahead
… …
1030 pread (fd, eio_buf, len, offset); 660 pread (fd, eio_buf, len, offset);
1031 offset += len; 661 offset += len;
1032 todo -= len; 662 todo -= len;
1033 } 663 }
1034 664
1035 errno = 0; 665 FUBd;
666
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 */
1036 return count; 669 return 0;
1037} 670}
1038 671
1039#endif 672#endif
1040 673
1041/* sendfile always needs emulation */ 674/* sendfile always needs emulation */
1042static eio_ssize_t 675static eio_ssize_t
1043eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self) 676eio__sendfile (int ofd, int ifd, off_t offset, size_t count)
1044{ 677{
1045 eio_ssize_t written = 0; 678 eio_ssize_t written = 0;
1046 eio_ssize_t res; 679 eio_ssize_t res;
1047 680
1048 if (!count) 681 if (!count)
… …
1076 709
1077 /* according to source inspection, this is correct, and useful behaviour */ 710 /* according to source inspection, this is correct, and useful behaviour */
1078 if (sbytes) 711 if (sbytes)
1079 res = sbytes; 712 res = sbytes;
1080 713
1081# elif defined (__APPLE__) 714# elif defined __APPLE__
1082 off_t sbytes = count; 715 off_t sbytes = count;
1083 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 716 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1084 717
1085 /* according to the manpage, sbytes is always valid */ 718 /* according to the manpage, sbytes is always valid */
1086 if (sbytes) 719 if (sbytes)
… …
1113 HANDLE h = TO_SOCKET (ifd); 746 HANDLE h = TO_SOCKET (ifd);
1114 SetFilePointer (h, offset, 0, FILE_BEGIN); 747 SetFilePointer (h, offset, 0, FILE_BEGIN);
1115 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0); 748 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1116 749
1117#else 750#else
1118 res = -1; 751 res = EIO_ENOSYS ();
1119 errno = ENOSYS;
1120#endif 752#endif
1121 753
1122 /* we assume sendfile can copy at least 128mb in one go */ 754 /* we assume sendfile can copy at least 128mb in one go */
1123 if (res <= 128 * 1024 * 1024) 755 if (res <= 128 * 1024 * 1024)
1124 { 756 {
… …
1184 816
1185 offset += cnt; 817 offset += cnt;
1186 res += cnt; 818 res += cnt;
1187 count -= cnt; 819 count -= cnt;
1188 } 820 }
821
822 FUBd;
1189 } 823 }
1190 824
1191 return res; 825 return res;
1192} 826}
1193 827
… …
1309 943
1310/*****************************************************************************/ 944/*****************************************************************************/
1311/* requests implemented outside eio_execute, because they are so large */ 945/* requests implemented outside eio_execute, because they are so large */
1312 946
1313static void 947static void
1314eio__realpath (eio_req *req, etp_worker *self) 948eio__lseek (eio_req *req)
1315{ 949{
1316 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{
1317 char *res; 965 char *res;
966 const char *rel = path;
1318 char *tmp1, *tmp2; 967 char *tmp1, *tmp2;
1319#if SYMLOOP_MAX > 32 968#if SYMLOOP_MAX > 32
1320 int symlinks = SYMLOOP_MAX; 969 int symlinks = SYMLOOP_MAX;
1321#else 970#else
1322 int symlinks = 32; 971 int symlinks = 32;
1323#endif 972#endif
1324 973
1325 req->result = -1;
1326
1327 errno = EINVAL; 974 errno = EINVAL;
1328 if (!rel) 975 if (!rel)
1329 return; 976 return -1;
1330 977
1331 errno = ENOENT; 978 errno = ENOENT;
1332 if (!*rel) 979 if (!*rel)
1333 return; 980 return -1;
1334 981
1335 if (!req->ptr2) 982 res = etp_tmpbuf_get (tmpbuf, PATH_MAX * 3);
1336 { 983#ifdef _WIN32
1337 X_LOCK (wrklock); 984 if (_access (rel, 4) != 0)
1338 req->flags |= EIO_FLAG_PTR2_FREE;
1339 X_UNLOCK (wrklock);
1340 req->ptr2 = malloc (PATH_MAX * 3);
1341
1342 errno = ENOMEM;
1343 if (!req->ptr2)
1344 return; 985 return -1;
1345 }
1346 986
1347 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
1348 tmp1 = res + PATH_MAX; 1000 tmp1 = res + PATH_MAX;
1349 tmp2 = tmp1 + PATH_MAX; 1001 tmp2 = tmp1 + PATH_MAX;
1350 1002
1351#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 */
1352#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1004#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
… …
1356 1008
1357 if (fd >= 0) 1009 if (fd >= 0)
1358 { 1010 {
1359 sprintf (tmp1, "/proc/self/fd/%d", fd); 1011 sprintf (tmp1, "/proc/self/fd/%d", fd);
1360 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 */
1361 close (fd); 1014 close (fd);
1362
1363 /* here we should probably stat the open file and the disk file, to make sure they still match */
1364 1015
1365 if (req->result > 0) 1016 if (req->result > 0)
1366 goto done; 1017 goto done;
1367 } 1018 }
1368 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)
1369 return; 1020 return -1;
1370 } 1021 }
1371#endif 1022#endif
1372#endif 1023#endif
1373 1024
1374 if (*rel != '/') 1025 if (*rel != '/')
1375 { 1026 {
1027 int len;
1028
1029 errno = ENOENT;
1030 if (wd == EIO_INVALID_WD)
1031 return -1;
1032
1033 if (wd == EIO_CWD)
1034 {
1376 if (!getcwd (res, PATH_MAX)) 1035 if (!getcwd (res, PATH_MAX))
1377 return; 1036 return -1;
1037
1038 len = strlen (res);
1039 }
1040 else
1041 memcpy (res, wd->str, len = wd->len);
1378 1042
1379 if (res [1]) /* only use if not / */ 1043 if (res [1]) /* only use if not / */
1380 res += strlen (res); 1044 res += len;
1381 } 1045 }
1382 1046
1383 while (*rel) 1047 while (*rel)
1384 { 1048 {
1385 eio_ssize_t len, linklen; 1049 eio_ssize_t len, linklen;
1386 char *beg = rel; 1050 const char *beg = rel;
1387 1051
1388 while (*rel && *rel != '/') 1052 while (*rel && *rel != '/')
1389 ++rel; 1053 ++rel;
1390 1054
1391 len = rel - beg; 1055 len = rel - beg;
… …
1403 1067
1404 if (beg [1] == '.' && len == 2) 1068 if (beg [1] == '.' && len == 2)
1405 { 1069 {
1406 /* .. - back up one component, if possible */ 1070 /* .. - back up one component, if possible */
1407 1071
1408 while (res != req->ptr2) 1072 while (res != tmpbuf->ptr)
1409 if (*--res == '/') 1073 if (*--res == '/')
1410 break; 1074 break;
1411 1075
1412 continue; 1076 continue;
1413 } 1077 }
1414 } 1078 }
1415 1079
1416 errno = ENAMETOOLONG; 1080 errno = ENAMETOOLONG;
1417 if (res + 1 + len + 1 >= tmp1) 1081 if (res + 1 + len + 1 >= tmp1)
1418 return; 1082 return -1;
1419 1083
1420 /* copy one component */ 1084 /* copy one component */
1421 *res = '/'; 1085 *res = '/';
1422 memcpy (res + 1, beg, len); 1086 memcpy (res + 1, beg, len);
1423 1087
1424 /* zero-terminate, for readlink */ 1088 /* zero-terminate, for readlink */
1425 res [len + 1] = 0; 1089 res [len + 1] = 0;
1426 1090
1427 /* now check if it's a symlink */ 1091 /* now check if it's a symlink */
1428 linklen = readlink (req->ptr2, tmp1, PATH_MAX); 1092 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1429 1093
1430 if (linklen < 0) 1094 if (linklen < 0)
1431 { 1095 {
1432 if (errno != EINVAL) 1096 if (errno != EINVAL)
1433 return; 1097 return -1;
1434 1098
1435 /* it's a normal directory. hopefully */ 1099 /* it's a normal directory. hopefully */
1436 res += len + 1; 1100 res += len + 1;
1437 } 1101 }
1438 else 1102 else
… …
1440 /* yay, it was a symlink - build new path in tmp2 */ 1104 /* yay, it was a symlink - build new path in tmp2 */
1441 int rellen = strlen (rel); 1105 int rellen = strlen (rel);
1442 1106
1443 errno = ENAMETOOLONG; 1107 errno = ENAMETOOLONG;
1444 if (linklen + 1 + rellen >= PATH_MAX) 1108 if (linklen + 1 + rellen >= PATH_MAX)
1445 return; 1109 return -1;
1446 1110
1447 errno = ELOOP; 1111 errno = ELOOP;
1448 if (!--symlinks) 1112 if (!--symlinks)
1449 return; 1113 return -1;
1450 1114
1451 if (*tmp1 == '/') 1115 if (*tmp1 == '/')
1452 res = req->ptr2; /* symlink resolves to an absolute path */ 1116 res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1453 1117
1454 /* 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 */
1455 memmove (tmp2 + linklen + 1, rel, rellen + 1); 1119 memmove (tmp2 + linklen + 1, rel, rellen + 1);
1456 tmp2 [linklen] = '/'; 1120 tmp2 [linklen] = '/';
1457 memcpy (tmp2, tmp1, linklen); 1121 memcpy (tmp2, tmp1, linklen);
… …
1459 rel = tmp2; 1123 rel = tmp2;
1460 } 1124 }
1461 } 1125 }
1462 1126
1463 /* special case for the lone root path */ 1127 /* special case for the lone root path */
1464 if (res == req->ptr2) 1128 if (res == tmpbuf->ptr)
1465 *res++ = '/'; 1129 *res++ = '/';
1466 1130
1467 req->result = res - (char *)req->ptr2; 1131 return res - (char *)tmpbuf->ptr;
1468 1132#endif
1469done:
1470 req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1471} 1133}
1472 1134
1473static signed char 1135static signed char
1474eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1136eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1475{ 1137{
… …
1483 1145
1484#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */ 1146#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
1485#define EIO_SORT_FAST 60 /* when to only use insertion sort */ 1147#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1486 1148
1487static void 1149static void
1488eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1150eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1489{ 1151{
1490 unsigned char bits [9 + sizeof (ino_t) * 8]; 1152 unsigned char bits [9 + sizeof (eio_ino_t) * 8];
1491 unsigned char *bit = bits; 1153 unsigned char *bit = bits;
1492 1154
1493 assert (CHAR_BIT == 8); 1155 assert (CHAR_BIT == 8);
1494 assert (sizeof (eio_dirent) * 8 < 256); 1156 assert (sizeof (eio_dirent) * 8 < 256);
1495 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */ 1157 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
… …
1497 1159
1498 if (size <= EIO_SORT_FAST) 1160 if (size <= EIO_SORT_FAST)
1499 return; 1161 return;
1500 1162
1501 /* first prepare an array of bits to test in our radix sort */ 1163 /* first prepare an array of bits to test in our radix sort */
1502 /* try to take endianness into account, as well as differences in ino_t sizes */ 1164 /* try to take endianness into account, as well as differences in eio_ino_t sizes */
1503 /* inode_bits must contain all inodes ORed together */ 1165 /* inode_bits must contain all inodes ORed together */
1504 /* which is used to skip bits that are 0 everywhere, which is very common */ 1166 /* which is used to skip bits that are 0 everywhere, which is very common */
1505 { 1167 {
1506 ino_t endianness; 1168 eio_ino_t endianness;
1507 int i, j; 1169 int i, j;
1508 1170
1509 /* we store the byte offset of byte n into byte n of "endianness" */ 1171 /* we store the byte offset of byte n into byte n of "endianness" */
1510 for (i = 0; i < sizeof (ino_t); ++i) 1172 for (i = 0; i < sizeof (eio_ino_t); ++i)
1511 ((unsigned char *)&endianness)[i] = i; 1173 ((unsigned char *)&endianness)[i] = i;
1512 1174
1513 *bit++ = 0; 1175 *bit++ = 0;
1514 1176
1515 for (i = 0; i < sizeof (ino_t); ++i) 1177 for (i = 0; i < sizeof (eio_ino_t); ++i)
1516 { 1178 {
1517 /* shifting off the byte offsets out of "endianness" */ 1179 /* shifting off the byte offsets out of "endianness" */
1518 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8; 1180 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1519 endianness >>= 8; 1181 endianness >>= 8;
1520 1182
1521 for (j = 0; j < 8; ++j) 1183 for (j = 0; j < 8; ++j)
1522 if (inode_bits & (((ino_t)1) << (i * 8 + j))) 1184 if (inode_bits & (((eio_ino_t)1) << (i * 8 + j)))
1523 *bit++ = offs + j; 1185 *bit++ = offs + j;
1524 } 1186 }
1525 1187
1526 for (j = 0; j < 8; ++j) 1188 for (j = 0; j < 8; ++j)
1527 if (score_bits & (1 << j)) 1189 if (score_bits & (1 << j))
1528 *bit++ = offsetof (eio_dirent, score) * 8 + j; 1190 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1529 } 1191 }
1530 1192
1531 /* now actually do the sorting (a variant of MSD radix sort) */ 1193 /* now actually do the sorting (a variant of MSD radix sort) */
1532 { 1194 {
1533 eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base; 1195 eio_dirent *base_stk [9 + sizeof (eio_ino_t) * 8], *base;
1534 eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end; 1196 eio_dirent *end_stk [9 + sizeof (eio_ino_t) * 8], *end;
1535 unsigned char *bit_stk [9 + sizeof (ino_t) * 8]; 1197 unsigned char *bit_stk [9 + sizeof (eio_ino_t) * 8];
1536 int stk_idx = 0; 1198 int stk_idx = 0;
1537 1199
1538 base_stk [stk_idx] = dents; 1200 base_stk [stk_idx] = dents;
1539 end_stk [stk_idx] = dents + size; 1201 end_stk [stk_idx] = dents + size;
1540 bit_stk [stk_idx] = bit - 1; 1202 bit_stk [stk_idx] = bit - 1;
… …
1619 } 1281 }
1620 } 1282 }
1621} 1283}
1622 1284
1623static void 1285static void
1624eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1286eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1625{ 1287{
1626 if (size <= 1) 1288 if (size <= 1)
1627 return; /* our insertion sort relies on size > 0 */ 1289 return; /* our insertion sort relies on size > 0 */
1628 1290
1629 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */ 1291 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
… …
1637 1299
1638/* read a full directory */ 1300/* read a full directory */
1639static void 1301static void
1640eio__scandir (eio_req *req, etp_worker *self) 1302eio__scandir (eio_req *req, etp_worker *self)
1641{ 1303{
1642 DIR *dirp;
1643 EIO_STRUCT_DIRENT *entp;
1644 char *name, *names; 1304 char *name, *names;
1645 int namesalloc = 4096; 1305 int namesalloc = 4096 - sizeof (void *) * 4;
1646 int namesoffs = 0; 1306 int namesoffs = 0;
1647 int flags = req->int1; 1307 int flags = req->int1;
1648 eio_dirent *dents = 0; 1308 eio_dirent *dents = 0;
1649 int dentalloc = 128; 1309 int dentalloc = 128;
1650 int dentoffs = 0; 1310 int dentoffs = 0;
1651 ino_t inode_bits = 0; 1311 eio_ino_t inode_bits = 0;
1312#ifdef _WIN32
1313 HANDLE dirp;
1314 WIN32_FIND_DATA entp;
1315#else
1316 DIR *dirp;
1317 EIO_STRUCT_DIRENT *entp;
1318#endif
1652 1319
1653 req->result = -1; 1320 req->result = -1;
1654 1321
1655 if (!(flags & EIO_READDIR_DENTS)) 1322 if (!(flags & EIO_READDIR_DENTS))
1656 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1323 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1657 1324
1658 X_LOCK (wrklock); 1325#ifdef _WIN32
1659 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1326 {
1327 int len = strlen ((const char *)req->ptr1);
1328 char *path = malloc (MAX_PATH);
1329 const char *fmt;
1330 const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1331
1332 if (!len)
1333 fmt = "./*";
1334 else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1335 fmt = "%s*";
1336 else
1337 fmt = "%s/*";
1338
1339 _snprintf (path, MAX_PATH, fmt, reqpath);
1340 dirp = FindFirstFile (path, &entp);
1341 free (path);
1342
1343 if (dirp == INVALID_HANDLE_VALUE)
1344 {
1345 /* should steal _dosmaperr */
1346 switch (GetLastError ())
1347 {
1348 case ERROR_FILE_NOT_FOUND:
1349 req->result = 0;
1350 break;
1351
1352 case ERROR_INVALID_NAME:
1353 case ERROR_PATH_NOT_FOUND:
1354 case ERROR_NO_MORE_FILES:
1355 errno = ENOENT;
1356 break;
1357
1358 case ERROR_NOT_ENOUGH_MEMORY:
1359 errno = ENOMEM;
1360 break;
1361
1362 default:
1363 errno = EINVAL;
1364 break;
1365 }
1366
1367 return;
1368 }
1369 }
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
1660 self->dirp = 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;
1392#endif
1661 1393
1662 if (req->flags & EIO_FLAG_PTR1_FREE) 1394 if (req->flags & EIO_FLAG_PTR1_FREE)
1663 free (req->ptr1); 1395 free (req->ptr1);
1664 1396
1665 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1397 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1666 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1398 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1667 req->ptr2 = names = malloc (namesalloc); 1399 req->ptr2 = names = malloc (namesalloc);
1668 X_UNLOCK (wrklock);
1669 1400
1670 if (dirp && names && (!flags || dents)) 1401 if (!names || (flags && !dents))
1402 return;
1403
1671 for (;;) 1404 for (;;)
1672 { 1405 {
1406 int done;
1407
1408#ifdef _WIN32
1409 done = !dirp;
1410#else
1673 errno = 0; 1411 errno = 0;
1674 entp = readdir (dirp); 1412 entp = readdir (dirp);
1413 done = !entp;
1414#endif
1675 1415
1676 if (!entp) 1416 if (done)
1677 { 1417 {
1418#ifndef _WIN32
1419 int old_errno = errno;
1420 closedir (dirp);
1421 errno = old_errno;
1422
1678 if (errno) 1423 if (errno)
1679 break; 1424 break;
1425#endif
1680 1426
1681 /* sort etc. */ 1427 /* sort etc. */
1682 req->int1 = flags; 1428 req->int1 = flags;
1683 req->result = dentoffs; 1429 req->result = dentoffs;
1684 1430
1685 if (flags & EIO_READDIR_STAT_ORDER) 1431 if (flags & EIO_READDIR_STAT_ORDER)
1686 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);
1687 else if (flags & EIO_READDIR_DIRS_FIRST) 1433 else if (flags & EIO_READDIR_DIRS_FIRST)
1688 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1434 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1689 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 */
1690 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))
1691 { 1487 {
1692 /* 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
1693 eio_dirent *oth = dents + dentoffs; 1495 ent = dents + dentoffs;
1694 eio_dirent *dir = dents;
1695 1496
1696 /* 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 */
1697 /* by walking from both sides and swapping if necessary */ 1498 ent->namelen = len - 1;
1698 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)
1699 { 1559 {
1700 if (dir->type == EIO_DT_DIR) 1560 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1701 ++dir; 1561 ent->score = 1;
1702 else if ((--oth)->type == EIO_DT_DIR) 1562 else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1703 { 1563 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1704 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1705
1706 ++dir;
1707 }
1708 } 1564 }
1709 1565 else if (ent->type == EIO_DT_DIR)
1710 /* now sort the dirs only (dirs all have the same score) */ 1566 ent->score = 0;
1711 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1712 } 1567 }
1713
1714 break;
1715 }
1716
1717 /* now add the entry to our list(s) */
1718 name = entp->d_name;
1719
1720 /* skip . and .. entries */
1721 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1722 {
1723 int len = D_NAMLEN (entp) + 1;
1724
1725 while (ecb_expect_false (namesoffs + len > namesalloc))
1726 {
1727 namesalloc *= 2;
1728 X_LOCK (wrklock);
1729 req->ptr2 = names = realloc (names, namesalloc);
1730 X_UNLOCK (wrklock);
1731
1732 if (!names)
1733 break;
1734 } 1568 }
1735 1569
1736 memcpy (names + namesoffs, name, len);
1737
1738 if (dents)
1739 {
1740 struct eio_dirent *ent;
1741
1742 if (ecb_expect_false (dentoffs == dentalloc))
1743 {
1744 dentalloc *= 2;
1745 X_LOCK (wrklock);
1746 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1747 X_UNLOCK (wrklock);
1748
1749 if (!dents)
1750 break;
1751 }
1752
1753 ent = dents + dentoffs;
1754
1755 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1756 ent->namelen = len - 1;
1757 ent->inode = D_INO (entp);
1758
1759 inode_bits |= ent->inode;
1760
1761 switch (D_TYPE (entp))
1762 {
1763 default:
1764 ent->type = EIO_DT_UNKNOWN;
1765 flags |= EIO_READDIR_FOUND_UNKNOWN;
1766 break;
1767
1768 #ifdef DT_FIFO
1769 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1770 #endif
1771 #ifdef DT_CHR
1772 case DT_CHR: ent->type = EIO_DT_CHR; break;
1773 #endif
1774 #ifdef DT_MPC
1775 case DT_MPC: ent->type = EIO_DT_MPC; break;
1776 #endif
1777 #ifdef DT_DIR
1778 case DT_DIR: ent->type = EIO_DT_DIR; break;
1779 #endif
1780 #ifdef DT_NAM
1781 case DT_NAM: ent->type = EIO_DT_NAM; break;
1782 #endif
1783 #ifdef DT_BLK
1784 case DT_BLK: ent->type = EIO_DT_BLK; break;
1785 #endif
1786 #ifdef DT_MPB
1787 case DT_MPB: ent->type = EIO_DT_MPB; break;
1788 #endif
1789 #ifdef DT_REG
1790 case DT_REG: ent->type = EIO_DT_REG; break;
1791 #endif
1792 #ifdef DT_NWK
1793 case DT_NWK: ent->type = EIO_DT_NWK; break;
1794 #endif
1795 #ifdef DT_CMP
1796 case DT_CMP: ent->type = EIO_DT_CMP; break;
1797 #endif
1798 #ifdef DT_LNK
1799 case DT_LNK: ent->type = EIO_DT_LNK; break;
1800 #endif
1801 #ifdef DT_SOCK
1802 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1803 #endif
1804 #ifdef DT_DOOR
1805 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1806 #endif
1807 #ifdef DT_WHT
1808 case DT_WHT: ent->type = EIO_DT_WHT; break;
1809 #endif
1810 }
1811
1812 ent->score = 7;
1813
1814 if (flags & EIO_READDIR_DIRS_FIRST)
1815 {
1816 if (ent->type == EIO_DT_UNKNOWN)
1817 {
1818 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1819 ent->score = 1;
1820 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1821 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1822 }
1823 else if (ent->type == EIO_DT_DIR)
1824 ent->score = 0;
1825 }
1826 }
1827
1828 namesoffs += len; 1570 namesoffs += len;
1829 ++dentoffs; 1571 ++dentoffs;
1830 } 1572 }
1831 1573
1832 if (EIO_CANCELLED (req)) 1574 if (EIO_CANCELLED (req))
1833 { 1575 {
1834 errno = ECANCELED; 1576 errno = ECANCELED;
1835 break; 1577 break;
1836 } 1578 }
1579
1580#ifdef _WIN32
1581 if (!FindNextFile (dirp, &entp))
1582 {
1583 FindClose (dirp);
1584 dirp = 0;
1837 } 1585 }
1586#endif
1587 }
1838} 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
1839 1711
1840/*****************************************************************************/ 1712/*****************************************************************************/
1841 1713
1842#define ALLOC(len) \ 1714#define ALLOC(len) \
1843 if (!req->ptr2) \ 1715 if (!req->ptr2) \
1844 { \ 1716 { \
1845 X_LOCK (wrklock); \ 1717 X_LOCK (EIO_POOL->wrklock); \
1846 req->flags |= EIO_FLAG_PTR2_FREE; \ 1718 req->flags |= EIO_FLAG_PTR2_FREE; \
1847 X_UNLOCK (wrklock); \ 1719 X_UNLOCK (EIO_POOL->wrklock); \
1848 req->ptr2 = malloc (len); \ 1720 req->ptr2 = malloc (len); \
1849 if (!req->ptr2) \ 1721 if (!req->ptr2) \
1850 { \ 1722 { \
1851 errno = ENOMEM; \ 1723 errno = ENOMEM; \
1852 req->result = -1; \ 1724 req->result = -1; \
1853 break; \ 1725 break; \
1854 } \ 1726 } \
1855 } 1727 }
1856 1728
1857X_THREAD_PROC (etp_proc)
1858{
1859 ETP_REQ *req;
1860 struct timespec ts;
1861 etp_worker *self = (etp_worker *)thr_arg;
1862 int timeout;
1863
1864 /* try to distribute timeouts somewhat evenly */
1865 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1866
1867 for (;;)
1868 {
1869 ts.tv_sec = 0;
1870
1871 X_LOCK (reqlock);
1872
1873 for (;;)
1874 {
1875 self->req = req = reqq_shift (&req_queue);
1876
1877 if (req)
1878 break;
1879
1880 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
1881 {
1882 X_UNLOCK (reqlock);
1883 X_LOCK (wrklock);
1884 --started;
1885 X_UNLOCK (wrklock);
1886 goto quit;
1887 }
1888
1889 ++idle;
1890
1891 if (idle <= max_idle)
1892 /* we are allowed to idle, so do so without any timeout */
1893 X_COND_WAIT (reqwait, reqlock);
1894 else
1895 {
1896 /* initialise timeout once */
1897 if (!ts.tv_sec)
1898 ts.tv_sec = time (0) + idle_timeout;
1899
1900 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1901 ts.tv_sec = 1; /* assuming this is not a value computed above.,.. */
1902 }
1903
1904 --idle;
1905 }
1906
1907 --nready;
1908
1909 X_UNLOCK (reqlock);
1910
1911 if (req->type < 0)
1912 goto quit;
1913
1914 ETP_EXECUTE (self, req);
1915
1916 X_LOCK (reslock);
1917
1918 ++npending;
1919
1920 if (!reqq_push (&res_queue, req) && want_poll_cb)
1921 want_poll_cb ();
1922
1923 self->req = 0;
1924 etp_worker_clear (self);
1925
1926 X_UNLOCK (reslock);
1927 }
1928
1929quit:
1930 X_LOCK (wrklock);
1931 etp_worker_free (self);
1932 X_UNLOCK (wrklock);
1933
1934 return 0;
1935}
1936
1937/*****************************************************************************/ 1729/*****************************************************************************/
1938 1730
1939int ecb_cold 1731int ecb_cold
1940eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1732eio_init (void (*want_poll)(void), void (*done_poll)(void))
1941{ 1733{
1942 return etp_init (want_poll, done_poll); 1734 eio_want_poll_cb = want_poll;
1735 eio_done_poll_cb = done_poll;
1736
1737 return etp_init (EIO_POOL, 0, 0, 0);
1943} 1738}
1944 1739
1945ecb_inline void 1740ecb_inline void
1946eio_api_destroy (eio_req *req) 1741eio_api_destroy (eio_req *req)
1947{ 1742{
1948 free (req); 1743 free (req);
1949} 1744}
1950 1745
1951#define REQ(rtype) \ 1746#define REQ(rtype) \
1952 eio_req *req; \ 1747 eio_req *req; \
1953 \ 1748 \
1954 req = (eio_req *)calloc (1, sizeof *req); \ 1749 req = (eio_req *)calloc (1, sizeof *req); \
1955 if (!req) \ 1750 if (!req) \
1956 return 0; \ 1751 return 0; \
… …
1970 { \ 1765 { \
1971 eio_api_destroy (req); \ 1766 eio_api_destroy (req); \
1972 return 0; \ 1767 return 0; \
1973 } 1768 }
1974 1769
1770#define SINGLEDOT(ptr) (0[(char *)(ptr)] == '.' && !1[(char *)(ptr)])
1771
1975static void 1772static void
1976eio_execute (etp_worker *self, eio_req *req) 1773eio_execute (etp_worker *self, eio_req *req)
1977{ 1774{
1775#if HAVE_AT
1776 int dirfd;
1777#else
1778 const char *path;
1779#endif
1780
1978 if (ecb_expect_false (EIO_CANCELLED (req))) 1781 if (ecb_expect_false (EIO_CANCELLED (req)))
1979 { 1782 {
1980 req->result = -1; 1783 req->result = -1;
1981 req->errorno = ECANCELED; 1784 req->errorno = ECANCELED;
1982 return; 1785 return;
1983 } 1786 }
1984 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
1985 switch (req->type) 1804 switch (req->type)
1986 { 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;
1987 case EIO_READ: ALLOC (req->size); 1813 case EIO_READ: ALLOC (req->size);
1988 req->result = req->offs >= 0 1814 req->result = req->offs >= 0
1989 ? pread (req->int1, req->ptr2, req->size, req->offs) 1815 ? pread (req->int1, req->ptr2, req->size, req->offs)
1990 : read (req->int1, req->ptr2, req->size); break; 1816 : read (req->int1, req->ptr2, req->size); break;
1991 case EIO_WRITE: req->result = req->offs >= 0 1817 case EIO_WRITE: req->result = req->offs >= 0
1992 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 1818 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1993 : write (req->int1, req->ptr2, req->size); break; 1819 : write (req->int1, req->ptr2, req->size); break;
1994 1820
1995 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;
1996 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break; 1822 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
1823
1824#if HAVE_AT
1997 1825
1998 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1826 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1999 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;
2000 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));
2001 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
2002 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1932 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2003 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 1933 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
2004 1934
2005 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2006 req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2007 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 1935 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2008 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 1936 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2009 1937
2010 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
2011 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;
2012 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
2013 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;
2014 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
2015 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break; 1940 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2016 1941
2017 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
2018 case EIO_CLOSE: req->result = close (req->int1); break; 1942 case EIO_CLOSE: req->result = close (req->int1); break;
2019 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 1943 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
2020 case EIO_UNLINK: req->result = unlink (req->ptr1); break;
2021 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
2022 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
2023 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
2024 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
2025 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
2026 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2027
2028 case EIO_REALPATH: eio__realpath (req, self); break;
2029
2030 case EIO_READLINK: ALLOC (PATH_MAX);
2031 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
2032
2033 case EIO_SYNC: req->result = 0; sync (); break; 1944 case EIO_SYNC: req->result = 0; sync (); break;
2034 case EIO_FSYNC: req->result = fsync (req->int1); break; 1945 case EIO_FSYNC: req->result = fsync (req->int1); break;
2035 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;
2036 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;
2037 case EIO_MTOUCH: req->result = eio__mtouch (req); break; 1950 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2038 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;
2039 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 1952 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2040 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2041 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;
2042 1954
2043 case EIO_READDIR: eio__scandir (req, self); break; 1955 case EIO_READDIR: eio__scandir (req, self); break;
2044 1956
2045 case EIO_BUSY: 1957 case EIO_BUSY:
… …
2055 req->result = select (0, 0, 0, 0, &tv); 1967 req->result = select (0, 0, 0, 0, &tv);
2056 } 1968 }
2057#endif 1969#endif
2058 break; 1970 break;
2059 1971
2060 case EIO_UTIME: 1972#if 0
2061 case EIO_FUTIME:
2062 {
2063 struct timeval tv[2];
2064 struct timeval *times;
2065
2066 if (req->nv1 != -1. || req->nv2 != -1.)
2067 {
2068 tv[0].tv_sec = req->nv1;
2069 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
2070 tv[1].tv_sec = req->nv2;
2071 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
2072
2073 times = tv;
2074 }
2075 else
2076 times = 0;
2077
2078 req->result = req->type == EIO_FUTIME
2079 ? futimes (req->int1, times)
2080 : utimes (req->ptr1, times);
2081 }
2082 break;
2083
2084 case EIO_GROUP: 1973 case EIO_GROUP:
2085 abort (); /* handled in eio_request */ 1974 abort (); /* handled in eio_request */
1975#endif
2086 1976
2087 case EIO_NOP: 1977 case EIO_NOP:
2088 req->result = 0; 1978 req->result = 0;
2089 break; 1979 break;
2090 1980
2091 case EIO_CUSTOM: 1981 case EIO_CUSTOM:
2092 req->feed (req); 1982 req->feed (req);
2093 break; 1983 break;
2094 1984
2095 default: 1985 default:
2096 errno = ENOSYS;
2097 req->result = -1; 1986 req->result = EIO_ENOSYS ();
2098 break; 1987 break;
2099 } 1988 }
2100 1989
2101 req->errorno = errno; 1990 req->errorno = errno;
2102} 1991}
2103 1992
2104#ifndef EIO_NO_WRAPPERS 1993#ifndef EIO_NO_WRAPPERS
2105 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
2106eio_req *eio_nop (int pri, eio_cb cb, void *data) 2005eio_req *eio_nop (int pri, eio_cb cb, void *data)
2107{ 2006{
2108 REQ (EIO_NOP); SEND; 2007 REQ (EIO_NOP); SEND;
2109} 2008}
2110 2009
… …
2126eio_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)
2127{ 2026{
2128 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;
2129} 2028}
2130 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
2131eio_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)
2132{ 2046{
2133 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;
2134} 2048}
2135 2049
… …
2141eio_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)
2142{ 2056{
2143 REQ (EIO_MLOCKALL); req->int1 = flags; SEND; 2057 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2144} 2058}
2145 2059
2146eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2147{
2148 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2149}
2150
2151eio_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)
2152{ 2061{
2153 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;
2154} 2063}
2155 2064
2156eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2157{
2158 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2159}
2160
2161eio_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)
2162{ 2066{
2163 REQ (EIO_CLOSE); req->int1 = fd; SEND; 2067 REQ (EIO_CLOSE); req->int1 = fd; SEND;
2164} 2068}
2165 2069
2166eio_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)
2167{ 2071{
2168 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;
2169} 2078}
2170 2079
2171eio_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)
2172{ 2081{
2173 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;
… …
2371void 2280void
2372eio_grp_add (eio_req *grp, eio_req *req) 2281eio_grp_add (eio_req *grp, eio_req *req)
2373{ 2282{
2374 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));
2375 2284
2376 grp->flags |= EIO_FLAG_GROUPADD; 2285 grp->flags |= ETP_FLAG_GROUPADD;
2377 2286
2378 ++grp->size; 2287 ++grp->size;
2379 req->grp = grp; 2288 req->grp = grp;
2380 2289
2381 req->grp_prev = 0; 2290 req->grp_prev = 0;
… …
2391/* misc garbage */ 2300/* misc garbage */
2392 2301
2393eio_ssize_t 2302eio_ssize_t
2394eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2303eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2395{ 2304{
2396 etp_worker wrk;
2397 eio_ssize_t ret;
2398
2399 wrk.dbuf = 0;
2400
2401 ret = eio__sendfile (ofd, ifd, offset, count, &wrk); 2305 return eio__sendfile (ofd, ifd, offset, count);
2402
2403 if (wrk.dbuf)
2404 free (wrk.dbuf);
2405
2406 return ret;
2407} 2306}
2408 2307

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines