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

Comparing libeio/eio.c (file contents):
Revision 1.92 by root, Sun Jul 17 18:27:17 2011 UTC vs.
Revision 1.143 by root, Sat Dec 3 16:33:46 2016 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines