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

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

Diff Legend

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