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

Comparing libeio/eio.c (file contents):
Revision 1.121 by root, Sat Jun 2 20:13:26 2012 UTC vs.
Revision 1.150 by root, Fri Jun 15 02:57:36 2018 UTC

1/* 1/*
2 * libeio implementation 2 * libeio implementation
3 * 3 *
4 * Copyright (c) 2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann <libeio@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010,2011,2012,2013,2016,2017 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 X_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>
… …
120 #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))
121 116
122 #define chmod(path,mode) _chmod (path, mode) 117 #define chmod(path,mode) _chmod (path, mode)
123 #define dup(fd) _dup (fd) 118 #define dup(fd) _dup (fd)
124 #define dup2(fd1,fd2) _dup2 (fd1, fd2) 119 #define dup2(fd1,fd2) _dup2 (fd1, fd2)
120 #define pipe(fds) _pipe (fds, 4096, O_BINARY)
125 121
122 #define fcntl(fd,cmd,arg) EIO_ENOSYS ()
123 #define ioctl(fd,cmd,arg) EIO_ENOSYS ()
126 #define fchmod(fd,mode) EIO_ENOSYS () 124 #define fchmod(fd,mode) EIO_ENOSYS ()
127 #define chown(path,uid,gid) EIO_ENOSYS () 125 #define chown(path,uid,gid) EIO_ENOSYS ()
128 #define fchown(fd,uid,gid) EIO_ENOSYS () 126 #define fchown(fd,uid,gid) EIO_ENOSYS ()
129 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */ 127 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
130 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */ 128 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
131 #define mknod(path,mode,dev) EIO_ENOSYS () 129 #define mknod(path,mode,dev) EIO_ENOSYS ()
132 #define sync() EIO_ENOSYS () 130 #define sync() EIO_ENOSYS ()
133 #define readlink(path,buf,s) EIO_ENOSYS () 131 #define readlink(path,buf,s) EIO_ENOSYS ()
134 #define statvfs(path,buf) EIO_ENOSYS () 132 #define statvfs(path,buf) EIO_ENOSYS ()
135 #define fstatvfs(fd,buf) EIO_ENOSYS () 133 #define fstatvfs(fd,buf) EIO_ENOSYS ()
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 }
136 169
137 /* rename() uses MoveFile, which fails to overwrite */ 170 /* rename() uses MoveFile, which fails to overwrite */
138 #define rename(old,neu) eio__rename (old, neu) 171 #define rename(old,neu) eio__rename (old, neu)
139 172
140 static int 173 static int
… …
168 /* we could even stat and see if it exists */ 201 /* we could even stat and see if it exists */
169 static int 202 static int
170 symlink (const char *old, const char *neu) 203 symlink (const char *old, const char *neu)
171 { 204 {
172 #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)
173 if (CreateSymbolicLink (neu, old, 1)) 213 if (CreateSymbolicLink (neu, old, flags))
174 return 0; 214 return 0;
175
176 if (CreateSymbolicLink (neu, old, 0))
177 return 0;
178 #endif 215 #endif
179 216
180 return EIO_ERRNO (ENOENT, -1); 217 return EIO_ERRNO (ENOENT, -1);
181 } 218 }
182 219
183 /* POSIX API only */ 220 /* POSIX API only, causing trouble for win32 apps */
184 #define CreateHardLink(neu,old,flags) 0 221 #define CreateHardLink(neu,old,flags) 0 /* not really creating hardlink, still using relative paths? */
185 #define CreateSymbolicLink(neu,old,flags) 0 222 #define CreateSymbolicLink(neu,old,flags) 0 /* vista+ only */
186 223
187 struct statvfs 224 struct statvfs
188 { 225 {
189 int dummy; 226 int dummy;
190 }; 227 };
… …
194 #define D_NAME(entp) entp.cFileName 231 #define D_NAME(entp) entp.cFileName
195 #define D_TYPE(entp) (entp.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? DT_DIR : DT_REG) 232 #define D_TYPE(entp) (entp.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? DT_DIR : DT_REG)
196 233
197#else 234#else
198 235
236 #include <sys/ioctl.h>
199 #include <sys/time.h> 237 #include <sys/time.h>
200 #include <sys/select.h> 238 #include <sys/select.h>
201 #include <sys/statvfs.h>
202 #include <unistd.h> 239 #include <unistd.h>
203 #include <signal.h> 240 #include <signal.h>
204 #include <dirent.h> 241 #include <dirent.h>
242
243 #ifdef ANDROID
244 #include <sys/vfs.h>
245 #define statvfs statfs
246 #define fstatvfs fstatfs
247 #include <asm/page.h> /* supposedly limits.h does #define PAGESIZE PAGESIZE */
248 #else
249 #include <sys/statvfs.h>
250 #endif
205 251
206 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES 252 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
207 #include <sys/mman.h> 253 #include <sys/mman.h>
208 #endif 254 #endif
209 255
… …
237# include <utime.h> 283# include <utime.h>
238#endif 284#endif
239 285
240#if HAVE_SYS_SYSCALL_H 286#if HAVE_SYS_SYSCALL_H
241# include <sys/syscall.h> 287# include <sys/syscall.h>
242#endif
243
244#if HAVE_SYS_PRCTL_H
245# include <sys/prctl.h>
246#endif 288#endif
247 289
248#if HAVE_SENDFILE 290#if HAVE_SENDFILE
249# if __linux 291# if __linux
250# include <sys/sendfile.h> 292# include <sys/sendfile.h>
… …
258# else 300# else
259# error sendfile support requested but not available 301# error sendfile support requested but not available
260# endif 302# endif
261#endif 303#endif
262 304
305#if HAVE_RENAMEAT2
306# include <sys/syscall.h>
307# include <linux/fs.h>
308#endif
309
263#ifndef D_TYPE 310#ifndef D_TYPE
264# define D_TYPE(de) 0 311# define D_TYPE(de) 0
265#endif 312#endif
266#ifndef D_INO 313#ifndef D_INO
267# define D_INO(de) 0 314# define D_INO(de) 0
… …
275# define NAME_MAX 4096 322# define NAME_MAX 4096
276#endif 323#endif
277 324
278/* used for readlink etc. */ 325/* used for readlink etc. */
279#ifndef PATH_MAX 326#ifndef PATH_MAX
280# define PATH_MAX 4096 327# define PATH_MAX 0
281#endif 328#endif
329
330#ifndef O_CLOEXEC
331 #define O_CLOEXEC 0
332#endif
333
334#ifndef EIO_PATH_MIN
335# define EIO_PATH_MIN 8160
336#endif
337
338#define EIO_PATH_MAX (PATH_MAX <= EIO_PATH_MIN ? EIO_PATH_MIN : PATH_MAX)
282 339
283/* buffer size for various temporary buffers */ 340/* buffer size for various temporary buffers */
284#define EIO_BUFSIZE 65536 341#define EIO_BUFSIZE 65536
285 342
286#define dBUF \ 343#define dBUF \
287 char *eio_buf = malloc (EIO_BUFSIZE); \ 344 char *eio_buf = malloc (EIO_BUFSIZE); \
288 errno = ENOMEM; \ 345 errno = ENOMEM; \
289 if (!eio_buf) \ 346 if (!eio_buf) \
290 return -1 347 return -1
291 348
292#define FUBd \ 349#define FUBd \
293 free (eio_buf) 350 free (eio_buf)
294 351
295#define EIO_TICKS ((1000000 + 1023) >> 10)
296
297/*****************************************************************************/ 352/*****************************************************************************/
298 353
299struct tmpbuf
300{
301 void *ptr;
302 int len;
303};
304
305static void *
306tmpbuf_get (struct tmpbuf *buf, int len)
307{
308 if (buf->len < len)
309 {
310 free (buf->ptr);
311 buf->ptr = malloc (buf->len = len);
312 }
313
314 return buf->ptr;
315}
316
317struct tmpbuf; 354struct etp_tmpbuf;
318 355
319#if _POSIX_VERSION >= 200809L 356#if _POSIX_VERSION >= 200809L
320 #define HAVE_AT 1 357 #define HAVE_AT 1
321 #define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD) 358 #define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD)
322 #ifndef O_SEARCH 359 #ifndef O_SEARCH
323 #define O_SEARCH O_RDONLY 360 #define O_SEARCH O_RDONLY
324 #endif 361 #endif
325#else 362#else
326 #define HAVE_AT 0 363 #define HAVE_AT 0
327 static const char *wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path); 364 static const char *wd_expand (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path);
328#endif 365#endif
329 366
330struct eio_pwd 367struct eio_pwd
331{ 368{
332#if HAVE_AT 369#if HAVE_AT
… …
339/*****************************************************************************/ 376/*****************************************************************************/
340 377
341#define ETP_PRI_MIN EIO_PRI_MIN 378#define ETP_PRI_MIN EIO_PRI_MIN
342#define ETP_PRI_MAX EIO_PRI_MAX 379#define ETP_PRI_MAX EIO_PRI_MAX
343 380
381#define ETP_TYPE_QUIT -1
382#define ETP_TYPE_GROUP EIO_GROUP
383
384static void eio_nop_callback (void) { }
385static void (*eio_want_poll_cb)(void) = eio_nop_callback;
386static void (*eio_done_poll_cb)(void) = eio_nop_callback;
387
388#define ETP_WANT_POLL(pool) eio_want_poll_cb ()
389#define ETP_DONE_POLL(pool) eio_done_poll_cb ()
390
344struct etp_worker; 391struct etp_worker;
345
346#define ETP_REQ eio_req 392#define ETP_REQ eio_req
347#define ETP_DESTROY(req) eio_destroy (req) 393#define ETP_DESTROY(req) eio_destroy (req)
348static int eio_finish (eio_req *req); 394static int eio_finish (eio_req *req);
349#define ETP_FINISH(req) eio_finish (req) 395#define ETP_FINISH(req) eio_finish (req)
350static void eio_execute (struct etp_worker *self, eio_req *req); 396static void eio_execute (struct etp_worker *self, eio_req *req);
351#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 397#define ETP_EXECUTE(wrk,req) eio_execute (wrk, req)
352 398
353/*****************************************************************************/ 399#include "etp.c"
354 400
355#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 401static struct etp_pool eio_pool;
356 402#define EIO_POOL (&eio_pool)
357/* calculate time difference in ~1/EIO_TICKS of a second */
358ecb_inline int
359tvdiff (struct timeval *tv1, struct timeval *tv2)
360{
361 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
362 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
363}
364
365static unsigned int started, idle, wanted = 4;
366
367static void (*want_poll_cb) (void);
368static void (*done_poll_cb) (void);
369
370static unsigned int max_poll_time; /* reslock */
371static unsigned int max_poll_reqs; /* reslock */
372
373static unsigned int nreqs; /* reqlock */
374static unsigned int nready; /* reqlock */
375static unsigned int npending; /* reqlock */
376static unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
377static unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
378
379static xmutex_t wrklock;
380static xmutex_t reslock;
381static xmutex_t reqlock;
382static xcond_t reqwait;
383
384typedef struct etp_worker
385{
386 struct tmpbuf tmpbuf;
387
388 /* locked by wrklock */
389 struct etp_worker *prev, *next;
390
391 xthread_t tid;
392
393#ifdef ETP_WORKER_COMMON
394 ETP_WORKER_COMMON
395#endif
396} etp_worker;
397
398static etp_worker wrk_first; /* NOT etp */
399
400#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
401#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
402
403/* worker threads management */
404
405static void
406etp_worker_clear (etp_worker *wrk)
407{
408}
409
410static void ecb_cold
411etp_worker_free (etp_worker *wrk)
412{
413 free (wrk->tmpbuf.ptr);
414
415 wrk->next->prev = wrk->prev;
416 wrk->prev->next = wrk->next;
417
418 free (wrk);
419}
420
421static unsigned int
422etp_nreqs (void)
423{
424 int retval;
425 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
426 retval = nreqs;
427 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
428 return retval;
429}
430
431static unsigned int
432etp_nready (void)
433{
434 unsigned int retval;
435
436 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
437 retval = nready;
438 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
439
440 return retval;
441}
442
443static unsigned int
444etp_npending (void)
445{
446 unsigned int retval;
447
448 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
449 retval = npending;
450 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
451
452 return retval;
453}
454
455static unsigned int
456etp_nthreads (void)
457{
458 unsigned int retval;
459
460 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
461 retval = started;
462 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
463
464 return retval;
465}
466
467/*
468 * a somewhat faster data structure might be nice, but
469 * with 8 priorities this actually needs <20 insns
470 * per shift, the most expensive operation.
471 */
472typedef struct {
473 ETP_REQ *qs[ETP_NUM_PRI], *qe[ETP_NUM_PRI]; /* qstart, qend */
474 int size;
475} etp_reqq;
476
477static etp_reqq req_queue;
478static etp_reqq res_queue;
479
480static void ecb_noinline ecb_cold
481reqq_init (etp_reqq *q)
482{
483 int pri;
484
485 for (pri = 0; pri < ETP_NUM_PRI; ++pri)
486 q->qs[pri] = q->qe[pri] = 0;
487
488 q->size = 0;
489}
490
491static int ecb_noinline
492reqq_push (etp_reqq *q, ETP_REQ *req)
493{
494 int pri = req->pri;
495 req->next = 0;
496
497 if (q->qe[pri])
498 {
499 q->qe[pri]->next = req;
500 q->qe[pri] = req;
501 }
502 else
503 q->qe[pri] = q->qs[pri] = req;
504
505 return q->size++;
506}
507
508static ETP_REQ * ecb_noinline
509reqq_shift (etp_reqq *q)
510{
511 int pri;
512
513 if (!q->size)
514 return 0;
515
516 --q->size;
517
518 for (pri = ETP_NUM_PRI; pri--; )
519 {
520 eio_req *req = q->qs[pri];
521
522 if (req)
523 {
524 if (!(q->qs[pri] = (eio_req *)req->next))
525 q->qe[pri] = 0;
526
527 return req;
528 }
529 }
530
531 abort ();
532}
533
534static int ecb_cold
535etp_init (void (*want_poll)(void), void (*done_poll)(void))
536{
537 X_MUTEX_CREATE (wrklock);
538 X_MUTEX_CREATE (reslock);
539 X_MUTEX_CREATE (reqlock);
540 X_COND_CREATE (reqwait);
541
542 reqq_init (&req_queue);
543 reqq_init (&res_queue);
544
545 wrk_first.next =
546 wrk_first.prev = &wrk_first;
547
548 started = 0;
549 idle = 0;
550 nreqs = 0;
551 nready = 0;
552 npending = 0;
553
554 want_poll_cb = want_poll;
555 done_poll_cb = done_poll;
556
557 return 0;
558}
559
560X_THREAD_PROC (etp_proc);
561
562static void ecb_cold
563etp_start_thread (void)
564{
565 etp_worker *wrk = calloc (1, sizeof (etp_worker));
566
567 /*TODO*/
568 assert (("unable to allocate worker thread data", wrk));
569
570 X_LOCK (wrklock);
571
572 if (thread_create (&wrk->tid, etp_proc, (void *)wrk))
573 {
574 wrk->prev = &wrk_first;
575 wrk->next = wrk_first.next;
576 wrk_first.next->prev = wrk;
577 wrk_first.next = wrk;
578 ++started;
579 }
580 else
581 free (wrk);
582
583 X_UNLOCK (wrklock);
584}
585
586static void
587etp_maybe_start_thread (void)
588{
589 if (ecb_expect_true (etp_nthreads () >= wanted))
590 return;
591
592 /* todo: maybe use idle here, but might be less exact */
593 if (ecb_expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
594 return;
595
596 etp_start_thread ();
597}
598
599static void ecb_cold
600etp_end_thread (void)
601{
602 eio_req *req = calloc (1, sizeof (eio_req)); /* will be freed by worker */
603
604 req->type = -1;
605 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
606
607 X_LOCK (reqlock);
608 reqq_push (&req_queue, req);
609 X_COND_SIGNAL (reqwait);
610 X_UNLOCK (reqlock);
611
612 X_LOCK (wrklock);
613 --started;
614 X_UNLOCK (wrklock);
615}
616
617static int
618etp_poll (void)
619{
620 unsigned int maxreqs;
621 unsigned int maxtime;
622 struct timeval tv_start, tv_now;
623
624 X_LOCK (reslock);
625 maxreqs = max_poll_reqs;
626 maxtime = max_poll_time;
627 X_UNLOCK (reslock);
628
629 if (maxtime)
630 gettimeofday (&tv_start, 0);
631
632 for (;;)
633 {
634 ETP_REQ *req;
635
636 etp_maybe_start_thread ();
637
638 X_LOCK (reslock);
639 req = reqq_shift (&res_queue);
640
641 if (req)
642 {
643 --npending;
644
645 if (!res_queue.size && done_poll_cb)
646 done_poll_cb ();
647 }
648
649 X_UNLOCK (reslock);
650
651 if (!req)
652 return 0;
653
654 X_LOCK (reqlock);
655 --nreqs;
656 X_UNLOCK (reqlock);
657
658 if (ecb_expect_false (req->type == EIO_GROUP && req->size))
659 {
660 req->int1 = 1; /* mark request as delayed */
661 continue;
662 }
663 else
664 {
665 int res = ETP_FINISH (req);
666 if (ecb_expect_false (res))
667 return res;
668 }
669
670 if (ecb_expect_false (maxreqs && !--maxreqs))
671 break;
672
673 if (maxtime)
674 {
675 gettimeofday (&tv_now, 0);
676
677 if (tvdiff (&tv_start, &tv_now) >= maxtime)
678 break;
679 }
680 }
681
682 errno = EAGAIN;
683 return -1;
684}
685
686static void
687etp_cancel (ETP_REQ *req)
688{
689 req->cancelled = 1;
690
691 eio_grp_cancel (req);
692}
693
694static void
695etp_submit (ETP_REQ *req)
696{
697 req->pri -= ETP_PRI_MIN;
698
699 if (ecb_expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
700 if (ecb_expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
701
702 if (ecb_expect_false (req->type == EIO_GROUP))
703 {
704 /* I hope this is worth it :/ */
705 X_LOCK (reqlock);
706 ++nreqs;
707 X_UNLOCK (reqlock);
708
709 X_LOCK (reslock);
710
711 ++npending;
712
713 if (!reqq_push (&res_queue, req) && want_poll_cb)
714 want_poll_cb ();
715
716 X_UNLOCK (reslock);
717 }
718 else
719 {
720 X_LOCK (reqlock);
721 ++nreqs;
722 ++nready;
723 reqq_push (&req_queue, req);
724 X_COND_SIGNAL (reqwait);
725 X_UNLOCK (reqlock);
726
727 etp_maybe_start_thread ();
728 }
729}
730
731static void ecb_cold
732etp_set_max_poll_time (double nseconds)
733{
734 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
735 max_poll_time = nseconds * EIO_TICKS;
736 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
737}
738
739static void ecb_cold
740etp_set_max_poll_reqs (unsigned int maxreqs)
741{
742 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
743 max_poll_reqs = maxreqs;
744 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
745}
746
747static void ecb_cold
748etp_set_max_idle (unsigned int nthreads)
749{
750 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
751 max_idle = nthreads;
752 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
753}
754
755static void ecb_cold
756etp_set_idle_timeout (unsigned int seconds)
757{
758 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
759 idle_timeout = seconds;
760 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
761}
762
763static void ecb_cold
764etp_set_min_parallel (unsigned int nthreads)
765{
766 if (wanted < nthreads)
767 wanted = nthreads;
768}
769
770static void ecb_cold
771etp_set_max_parallel (unsigned int nthreads)
772{
773 if (wanted > nthreads)
774 wanted = nthreads;
775
776 while (started > wanted)
777 etp_end_thread ();
778}
779 403
780/*****************************************************************************/ 404/*****************************************************************************/
781 405
782static void 406static void
783grp_try_feed (eio_req *grp) 407grp_try_feed (eio_req *grp)
784{ 408{
785 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 409 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
786 { 410 {
787 grp->flags &= ~EIO_FLAG_GROUPADD; 411 grp->flags &= ~ETP_FLAG_GROUPADD;
788 412
789 EIO_FEED (grp); 413 EIO_FEED (grp);
790 414
791 /* stop if no progress has been made */ 415 /* stop if no progress has been made */
792 if (!(grp->flags & EIO_FLAG_GROUPADD)) 416 if (!(grp->flags & ETP_FLAG_GROUPADD))
793 { 417 {
794 grp->feed = 0; 418 grp->feed = 0;
795 break; 419 break;
796 } 420 }
797 } 421 }
… …
804 428
805 /* call feeder, if applicable */ 429 /* call feeder, if applicable */
806 grp_try_feed (grp); 430 grp_try_feed (grp);
807 431
808 /* finish, if done */ 432 /* finish, if done */
809 if (!grp->size && grp->int1) 433 if (!grp->size && grp->flags & ETP_FLAG_DELAYED)
810 return eio_finish (grp); 434 return eio_finish (grp);
811 else 435 else
812 return 0; 436 return 0;
813} 437}
814 438
… …
850} 474}
851 475
852void 476void
853eio_grp_cancel (eio_req *grp) 477eio_grp_cancel (eio_req *grp)
854{ 478{
855 for (grp = grp->grp_first; grp; grp = grp->grp_next) 479 etp_grp_cancel (EIO_POOL, grp);
856 eio_cancel (grp);
857} 480}
858 481
859void 482void
860eio_cancel (eio_req *req) 483eio_cancel (eio_req *req)
861{ 484{
862 etp_cancel (req); 485 etp_cancel (EIO_POOL, req);
863} 486}
864 487
865void 488void
866eio_submit (eio_req *req) 489eio_submit (eio_req *req)
867{ 490{
868 etp_submit (req); 491 etp_submit (EIO_POOL, req);
869} 492}
870 493
871unsigned int 494unsigned int
872eio_nreqs (void) 495eio_nreqs (void)
873{ 496{
874 return etp_nreqs (); 497 return etp_nreqs (EIO_POOL);
875} 498}
876 499
877unsigned int 500unsigned int
878eio_nready (void) 501eio_nready (void)
879{ 502{
880 return etp_nready (); 503 return etp_nready (EIO_POOL);
881} 504}
882 505
883unsigned int 506unsigned int
884eio_npending (void) 507eio_npending (void)
885{ 508{
886 return etp_npending (); 509 return etp_npending (EIO_POOL);
887} 510}
888 511
889unsigned int ecb_cold 512unsigned int ecb_cold
890eio_nthreads (void) 513eio_nthreads (void)
891{ 514{
892 return etp_nthreads (); 515 return etp_nthreads (EIO_POOL);
893} 516}
894 517
895void ecb_cold 518void ecb_cold
896eio_set_max_poll_time (double nseconds) 519eio_set_max_poll_time (double nseconds)
897{ 520{
898 etp_set_max_poll_time (nseconds); 521 etp_set_max_poll_time (EIO_POOL, nseconds);
899} 522}
900 523
901void ecb_cold 524void ecb_cold
902eio_set_max_poll_reqs (unsigned int maxreqs) 525eio_set_max_poll_reqs (unsigned int maxreqs)
903{ 526{
904 etp_set_max_poll_reqs (maxreqs); 527 etp_set_max_poll_reqs (EIO_POOL, maxreqs);
905} 528}
906 529
907void ecb_cold 530void ecb_cold
908eio_set_max_idle (unsigned int nthreads) 531eio_set_max_idle (unsigned int nthreads)
909{ 532{
910 etp_set_max_idle (nthreads); 533 etp_set_max_idle (EIO_POOL, nthreads);
911} 534}
912 535
913void ecb_cold 536void ecb_cold
914eio_set_idle_timeout (unsigned int seconds) 537eio_set_idle_timeout (unsigned int seconds)
915{ 538{
916 etp_set_idle_timeout (seconds); 539 etp_set_idle_timeout (EIO_POOL, seconds);
917} 540}
918 541
919void ecb_cold 542void ecb_cold
920eio_set_min_parallel (unsigned int nthreads) 543eio_set_min_parallel (unsigned int nthreads)
921{ 544{
922 etp_set_min_parallel (nthreads); 545 etp_set_min_parallel (EIO_POOL, nthreads);
923} 546}
924 547
925void ecb_cold 548void ecb_cold
926eio_set_max_parallel (unsigned int nthreads) 549eio_set_max_parallel (unsigned int nthreads)
927{ 550{
928 etp_set_max_parallel (nthreads); 551 etp_set_max_parallel (EIO_POOL, nthreads);
929} 552}
930 553
931int eio_poll (void) 554int eio_poll (void)
932{ 555{
933 return etp_poll (); 556 return etp_poll (EIO_POOL);
934} 557}
935 558
936/*****************************************************************************/ 559/*****************************************************************************/
937/* work around various missing functions */ 560/* work around various missing functions */
561
562#if HAVE_POSIX_CLOSE && !__linux
563# define eio__close(fd) posix_close (fd, 0)
564#else
565# define eio__close(fd) close (fd)
566#endif
567
568/* close() without disturbing errno */
569static void
570silent_close (int fd)
571{
572 int saved_errno = errno;
573 eio__close (fd);
574 errno = saved_errno;
575}
938 576
939#ifndef HAVE_UTIMES 577#ifndef HAVE_UTIMES
940 578
941# undef utimes 579# undef utimes
942# define utimes(path,times) eio__utimes (path, times) 580# define utimes(path,times) eio__utimes (path, times)
… …
1321 intptr_t end = addr + len; 959 intptr_t end = addr + len;
1322 intptr_t page = eio_pagesize (); 960 intptr_t page = eio_pagesize ();
1323 961
1324 if (addr < end) 962 if (addr < end)
1325 if (flags & EIO_MT_MODIFY) /* modify */ 963 if (flags & EIO_MT_MODIFY) /* modify */
1326 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len && !EIO_CANCELLED (req)); 964 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < end && !EIO_CANCELLED (req));
1327 else 965 else
1328 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len && !EIO_CANCELLED (req)); 966 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < end && !EIO_CANCELLED (req));
1329 } 967 }
1330 968
1331 return 0; 969 return 0;
1332} 970}
1333 971
… …
1348 req->result = req->offs == (off_t)-1 ? -1 : 0; 986 req->result = req->offs == (off_t)-1 ? -1 : 0;
1349} 987}
1350 988
1351/* result will always end up in tmpbuf, there is always space for adding a 0-byte */ 989/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
1352static int 990static int
1353eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path) 991eio__realpath (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
1354{ 992{
993 char *res;
1355 const char *rel = path; 994 const char *rel = path;
1356 char *res;
1357 char *tmp1, *tmp2; 995 char *tmp1, *tmp2;
1358#if SYMLOOP_MAX > 32 996#if SYMLOOP_MAX > 32
1359 int symlinks = SYMLOOP_MAX; 997 int symlinks = SYMLOOP_MAX;
1360#else 998#else
1361 int symlinks = 32; 999 int symlinks = 32;
… …
1367 1005
1368 errno = ENOENT; 1006 errno = ENOENT;
1369 if (!*rel) 1007 if (!*rel)
1370 return -1; 1008 return -1;
1371 1009
1372 res = tmpbuf_get (tmpbuf, PATH_MAX * 3); 1010 res = etp_tmpbuf_get (tmpbuf, EIO_PATH_MAX * 3);
1011#ifdef _WIN32
1012 if (_access (rel, 4) != 0)
1013 return -1;
1014
1015 symlinks = GetFullPathName (rel, EIO_PATH_MAX * 3, res, 0);
1016
1017 errno = ENAMETOOLONG;
1018 if (symlinks >= EIO_PATH_MAX * 3)
1019 return -1;
1020
1021 errno = EIO;
1022 if (symlinks <= 0)
1023 return -1;
1024
1025 return symlinks;
1026
1027#else
1373 tmp1 = res + PATH_MAX; 1028 tmp1 = res + EIO_PATH_MAX;
1374 tmp2 = tmp1 + PATH_MAX; 1029 tmp2 = tmp1 + EIO_PATH_MAX;
1375 1030
1376#if 0 /* disabled, the musl way to do things is just too racy */ 1031#if 0 /* disabled, the musl way to do things is just too racy */
1377#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1032#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1378 /* on linux we may be able to ask the kernel */ 1033 /* on linux we may be able to ask the kernel */
1379 { 1034 {
1380 int fd = open (rel, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOATIME); 1035 int fd = open (rel, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOATIME);
1381 1036
1382 if (fd >= 0) 1037 if (fd >= 0)
1383 { 1038 {
1384 sprintf (tmp1, "/proc/self/fd/%d", fd); 1039 sprintf (tmp1, "/proc/self/fd/%d", fd);
1385 req->result = readlink (tmp1, res, PATH_MAX); 1040 req->result = readlink (tmp1, res, EIO_PATH_MAX);
1386 close (fd);
1387
1388 /* here we should probably stat the open file and the disk file, to make sure they still match */ 1041 /* here we should probably stat the open file and the disk file, to make sure they still match */
1042 eio__close (fd);
1389 1043
1390 if (req->result > 0) 1044 if (req->result > 0)
1391 goto done; 1045 goto done;
1392 } 1046 }
1393 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO) 1047 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO)
1394 return; 1048 return -1;
1395 } 1049 }
1396#endif 1050#endif
1397#endif 1051#endif
1398 1052
1399 if (*rel != '/') 1053 if (*rel != '/')
… …
1404 if (wd == EIO_INVALID_WD) 1058 if (wd == EIO_INVALID_WD)
1405 return -1; 1059 return -1;
1406 1060
1407 if (wd == EIO_CWD) 1061 if (wd == EIO_CWD)
1408 { 1062 {
1409 if (!getcwd (res, PATH_MAX)) 1063 if (!getcwd (res, EIO_PATH_MAX))
1410 return -1; 1064 return -1;
1411 1065
1412 len = strlen (res); 1066 len = strlen (res);
1413 } 1067 }
1414 else 1068 else
… …
1461 1115
1462 /* zero-terminate, for readlink */ 1116 /* zero-terminate, for readlink */
1463 res [len + 1] = 0; 1117 res [len + 1] = 0;
1464 1118
1465 /* now check if it's a symlink */ 1119 /* now check if it's a symlink */
1466 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX); 1120 linklen = readlink (tmpbuf->ptr, tmp1, EIO_PATH_MAX);
1467 1121
1468 if (linklen < 0) 1122 if (linklen < 0)
1469 { 1123 {
1470 if (errno != EINVAL) 1124 if (errno != EINVAL)
1471 return -1; 1125 return -1;
… …
1477 { 1131 {
1478 /* yay, it was a symlink - build new path in tmp2 */ 1132 /* yay, it was a symlink - build new path in tmp2 */
1479 int rellen = strlen (rel); 1133 int rellen = strlen (rel);
1480 1134
1481 errno = ENAMETOOLONG; 1135 errno = ENAMETOOLONG;
1482 if (linklen + 1 + rellen >= PATH_MAX) 1136 if (linklen + 1 + rellen >= EIO_PATH_MAX) /* also catch linklen >= EIO_PATH_MAX */
1483 return -1; 1137 return -1;
1484 1138
1485 errno = ELOOP; 1139 errno = ELOOP;
1486 if (!--symlinks) 1140 if (!--symlinks)
1487 return -1; 1141 return -1;
… …
1501 /* special case for the lone root path */ 1155 /* special case for the lone root path */
1502 if (res == tmpbuf->ptr) 1156 if (res == tmpbuf->ptr)
1503 *res++ = '/'; 1157 *res++ = '/';
1504 1158
1505 return res - (char *)tmpbuf->ptr; 1159 return res - (char *)tmpbuf->ptr;
1160#endif
1506} 1161}
1507 1162
1508static signed char 1163static signed char
1509eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1164eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1510{ 1165{
… …
1750 return; 1405 return;
1751 1406
1752 dirp = fdopendir (fd); 1407 dirp = fdopendir (fd);
1753 1408
1754 if (!dirp) 1409 if (!dirp)
1755 close (fd); 1410 silent_close (fd);
1756 } 1411 }
1757 else 1412 else
1758 dirp = opendir (req->ptr1); 1413 dirp = opendir (req->ptr1);
1759 #else 1414 #else
1760 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1)); 1415 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
… …
1883 #ifdef DT_FIFO 1538 #ifdef DT_FIFO
1884 case DT_FIFO: ent->type = EIO_DT_FIFO; break; 1539 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1885 #endif 1540 #endif
1886 #ifdef DT_CHR 1541 #ifdef DT_CHR
1887 case DT_CHR: ent->type = EIO_DT_CHR; break; 1542 case DT_CHR: ent->type = EIO_DT_CHR; break;
1888 #endif 1543 #endif
1889 #ifdef DT_MPC 1544 #ifdef DT_MPC
1890 case DT_MPC: ent->type = EIO_DT_MPC; break; 1545 case DT_MPC: ent->type = EIO_DT_MPC; break;
1891 #endif 1546 #endif
1892 #ifdef DT_DIR 1547 #ifdef DT_DIR
1893 case DT_DIR: ent->type = EIO_DT_DIR; break; 1548 case DT_DIR: ent->type = EIO_DT_DIR; break;
1894 #endif 1549 #endif
1895 #ifdef DT_NAM 1550 #ifdef DT_NAM
1896 case DT_NAM: ent->type = EIO_DT_NAM; break; 1551 case DT_NAM: ent->type = EIO_DT_NAM; break;
1897 #endif 1552 #endif
1898 #ifdef DT_BLK 1553 #ifdef DT_BLK
1899 case DT_BLK: ent->type = EIO_DT_BLK; break; 1554 case DT_BLK: ent->type = EIO_DT_BLK; break;
1900 #endif 1555 #endif
1901 #ifdef DT_MPB 1556 #ifdef DT_MPB
1902 case DT_MPB: ent->type = EIO_DT_MPB; break; 1557 case DT_MPB: ent->type = EIO_DT_MPB; break;
1903 #endif 1558 #endif
1904 #ifdef DT_REG 1559 #ifdef DT_REG
1905 case DT_REG: ent->type = EIO_DT_REG; break; 1560 case DT_REG: ent->type = EIO_DT_REG; break;
1906 #endif 1561 #endif
1907 #ifdef DT_NWK 1562 #ifdef DT_NWK
1908 case DT_NWK: ent->type = EIO_DT_NWK; break; 1563 case DT_NWK: ent->type = EIO_DT_NWK; break;
1909 #endif 1564 #endif
1910 #ifdef DT_CMP 1565 #ifdef DT_CMP
1911 case DT_CMP: ent->type = EIO_DT_CMP; break; 1566 case DT_CMP: ent->type = EIO_DT_CMP; break;
1912 #endif 1567 #endif
1913 #ifdef DT_LNK 1568 #ifdef DT_LNK
1914 case DT_LNK: ent->type = EIO_DT_LNK; break; 1569 case DT_LNK: ent->type = EIO_DT_LNK; break;
1915 #endif 1570 #endif
1916 #ifdef DT_SOCK 1571 #ifdef DT_SOCK
1917 case DT_SOCK: ent->type = EIO_DT_SOCK; break; 1572 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
… …
1969#if !HAVE_AT 1624#if !HAVE_AT
1970 1625
1971/* a bit like realpath, but usually faster because it doesn'T have to return */ 1626/* a bit like realpath, but usually faster because it doesn'T have to return */
1972/* an absolute or canonical path */ 1627/* an absolute or canonical path */
1973static const char * 1628static const char *
1974wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path) 1629wd_expand (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
1975{ 1630{
1976 if (!wd || *path == '/') 1631 if (!wd || *path == '/')
1977 return path; 1632 return path;
1978 1633
1979 if (path [0] == '.' && !path [1]) 1634 if (path [0] == '.' && !path [1])
… …
1981 1636
1982 { 1637 {
1983 int l1 = wd->len; 1638 int l1 = wd->len;
1984 int l2 = strlen (path); 1639 int l2 = strlen (path);
1985 1640
1986 char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2); 1641 char *res = etp_tmpbuf_get (tmpbuf, l1 + l2 + 2);
1987 1642
1988 memcpy (res, wd->str, l1); 1643 memcpy (res, wd->str, l1);
1989 res [l1] = '/'; 1644 res [l1] = '/';
1990 memcpy (res + l1 + 1, path, l2 + 1); 1645 memcpy (res + l1 + 1, path, l2 + 1);
1991 1646
… …
1994} 1649}
1995 1650
1996#endif 1651#endif
1997 1652
1998static eio_wd 1653static eio_wd
1999eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path) 1654eio__wd_open_sync (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
2000{ 1655{
2001 int fd; 1656 int fd;
2002 eio_wd res; 1657 eio_wd res;
2003 int len = eio__realpath (tmpbuf, wd, path); 1658 int len = eio__realpath (tmpbuf, wd, path);
2004 1659
… …
2026} 1681}
2027 1682
2028eio_wd 1683eio_wd
2029eio_wd_open_sync (eio_wd wd, const char *path) 1684eio_wd_open_sync (eio_wd wd, const char *path)
2030{ 1685{
2031 struct tmpbuf tmpbuf = { 0 }; 1686 struct etp_tmpbuf tmpbuf = { };
2032 wd = eio__wd_open_sync (&tmpbuf, wd, path); 1687 wd = eio__wd_open_sync (&tmpbuf, wd, path);
2033 free (tmpbuf.ptr); 1688 free (tmpbuf.ptr);
2034 1689
2035 return wd; 1690 return wd;
2036} 1691}
… …
2039eio_wd_close_sync (eio_wd wd) 1694eio_wd_close_sync (eio_wd wd)
2040{ 1695{
2041 if (wd != EIO_INVALID_WD && wd != EIO_CWD) 1696 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
2042 { 1697 {
2043 #if HAVE_AT 1698 #if HAVE_AT
2044 close (wd->fd); 1699 eio__close (wd->fd);
2045 #endif 1700 #endif
2046 free (wd); 1701 free (wd);
2047 } 1702 }
2048} 1703}
2049 1704
2050#if HAVE_AT 1705#if HAVE_AT
2051 1706
1707static int
1708eio__renameat2 (int olddirfd, const char *oldpath, int newdirfd, const char *newpath, unsigned int flags)
1709{
1710#if HAVE_RENAMEAT2
1711 return syscall (SYS_renameat2, olddirfd, oldpath, newdirfd, newpath, flags);
1712#else
1713 if (flags)
1714 return EIO_ENOSYS ();
1715
1716 return renameat (olddirfd, oldpath, newdirfd, newpath);
1717#endif
1718}
1719
2052/* they forgot these */ 1720/* they forgot these */
2053 1721
2054static int 1722static int
2055eio__truncateat (int dirfd, const char *path, off_t length) 1723eio__truncateat (int dirfd, const char *path, off_t length)
2056{ 1724{
… …
2059 1727
2060 if (fd < 0) 1728 if (fd < 0)
2061 return fd; 1729 return fd;
2062 1730
2063 res = ftruncate (fd, length); 1731 res = ftruncate (fd, length);
2064 close (fd); 1732 silent_close (fd);
2065 return res; 1733 return res;
2066} 1734}
2067 1735
2068static int 1736static int
2069eio__statvfsat (int dirfd, const char *path, struct statvfs *buf) 1737eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
… …
2073 1741
2074 if (fd < 0) 1742 if (fd < 0)
2075 return fd; 1743 return fd;
2076 1744
2077 res = fstatvfs (fd, buf); 1745 res = fstatvfs (fd, buf);
2078 close (fd); 1746 silent_close (fd);
2079 return res; 1747 return res;
2080
2081} 1748}
2082 1749
2083#endif 1750#endif
2084 1751
2085/*****************************************************************************/ 1752/*****************************************************************************/
2086 1753
2087#define ALLOC(len) \ 1754#define ALLOC(len) \
2088 if (!req->ptr2) \ 1755 if (!req->ptr2) \
2089 { \ 1756 { \
2090 X_LOCK (wrklock); \ 1757 X_LOCK (EIO_POOL->wrklock); \
2091 req->flags |= EIO_FLAG_PTR2_FREE; \ 1758 req->flags |= EIO_FLAG_PTR2_FREE; \
2092 X_UNLOCK (wrklock); \ 1759 X_UNLOCK (EIO_POOL->wrklock); \
2093 req->ptr2 = malloc (len); \ 1760 req->ptr2 = malloc (len); \
2094 if (!req->ptr2) \ 1761 if (!req->ptr2) \
2095 { \ 1762 { \
2096 errno = ENOMEM; \ 1763 errno = ENOMEM; \
2097 req->result = -1; \ 1764 req->result = -1; \
2098 break; \ 1765 goto alloc_fail; \
2099 } \ 1766 } \
2100 } 1767 }
2101 1768
2102static void ecb_noinline ecb_cold 1769/*****************************************************************************/
2103etp_proc_init (void)
2104{
2105#if HAVE_PRCTL_SET_NAME
2106 /* provide a more sensible "thread name" */
2107 char name[16 + 1];
2108 const int namelen = sizeof (name) - 1;
2109 int len;
2110 1770
2111 prctl (PR_GET_NAME, (unsigned long)name, 0, 0, 0); 1771static void
2112 name [namelen] = 0; 1772eio__slurp (int fd, eio_req *req)
2113 len = strlen (name);
2114 strcpy (name + (len <= namelen - 4 ? len : namelen - 4), "/eio");
2115 prctl (PR_SET_NAME, (unsigned long)name, 0, 0, 0);
2116#endif
2117}
2118
2119X_THREAD_PROC (etp_proc)
2120{ 1773{
2121 ETP_REQ *req; 1774 req->result = fd;
2122 struct timespec ts;
2123 etp_worker *self = (etp_worker *)thr_arg;
2124 1775
2125 etp_proc_init (); 1776 if (fd < 0)
1777 return;
2126 1778
2127 /* try to distribute timeouts somewhat evenly */ 1779 if (req->offs < 0 || !req->size) /* do we need the size? */
2128 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
2129
2130 for (;;)
2131 { 1780 {
2132 ts.tv_sec = 0; 1781 off_t size = lseek (fd, 0, SEEK_END);
2133 1782
2134 X_LOCK (reqlock);
2135
2136 for (;;)
2137 {
2138 req = reqq_shift (&req_queue);
2139
2140 if (req)
2141 break;
2142
2143 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
2144 {
2145 X_UNLOCK (reqlock);
2146 X_LOCK (wrklock);
2147 --started;
2148 X_UNLOCK (wrklock);
2149 goto quit;
2150 }
2151
2152 ++idle;
2153
2154 if (idle <= max_idle)
2155 /* we are allowed to idle, so do so without any timeout */
2156 X_COND_WAIT (reqwait, reqlock);
2157 else
2158 {
2159 /* initialise timeout once */
2160 if (!ts.tv_sec)
2161 ts.tv_sec = time (0) + idle_timeout;
2162
2163 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
2164 ts.tv_sec = 1; /* assuming this is not a value computed above.,.. */
2165 }
2166
2167 --idle;
2168 }
2169
2170 --nready;
2171
2172 X_UNLOCK (reqlock);
2173
2174 if (req->type < 0) 1783 if (req->offs < 0)
2175 goto quit; 1784 req->offs += size;
2176 1785
2177 ETP_EXECUTE (self, req); 1786 if (!req->size)
2178 1787 req->size = size - req->offs;
2179 X_LOCK (reslock);
2180
2181 ++npending;
2182
2183 if (!reqq_push (&res_queue, req) && want_poll_cb)
2184 want_poll_cb ();
2185
2186 etp_worker_clear (self);
2187
2188 X_UNLOCK (reslock);
2189 } 1788 }
2190 1789
2191quit: 1790 ALLOC (req->size);
2192 free (req); 1791 req->result = pread (fd, req->ptr2, req->size, req->offs);
2193 1792
2194 X_LOCK (wrklock); 1793 silent_close (fd);
2195 etp_worker_free (self);
2196 X_UNLOCK (wrklock);
2197}
2198 1794
2199/*****************************************************************************/ 1795alloc_fail:
1796 ;
1797}
2200 1798
2201int ecb_cold 1799int ecb_cold
2202eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1800eio_init (void (*want_poll)(void), void (*done_poll)(void))
2203{ 1801{
2204 return etp_init (want_poll, done_poll); 1802 eio_want_poll_cb = want_poll;
1803 eio_done_poll_cb = done_poll;
1804
1805 return etp_init (EIO_POOL, 0, 0, 0);
2205} 1806}
2206 1807
2207ecb_inline void 1808ecb_inline void
2208eio_api_destroy (eio_req *req) 1809eio_api_destroy (eio_req *req)
2209{ 1810{
… …
2232 { \ 1833 { \
2233 eio_api_destroy (req); \ 1834 eio_api_destroy (req); \
2234 return 0; \ 1835 return 0; \
2235 } 1836 }
2236 1837
1838#define SINGLEDOT(ptr) (0[(char *)(ptr)] == '.' && !1[(char *)(ptr)])
1839
2237static void 1840static void
2238eio_execute (etp_worker *self, eio_req *req) 1841eio_execute (etp_worker *self, eio_req *req)
2239{ 1842{
2240#if HAVE_AT 1843#if HAVE_AT
2241 int dirfd; 1844 int dirfd;
… …
2281 : read (req->int1, req->ptr2, req->size); break; 1884 : read (req->int1, req->ptr2, req->size); break;
2282 case EIO_WRITE: req->result = req->offs >= 0 1885 case EIO_WRITE: req->result = req->offs >= 0
2283 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 1886 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
2284 : write (req->int1, req->ptr2, req->size); break; 1887 : write (req->int1, req->ptr2, req->size); break;
2285 1888
1889 case EIO_FCNTL: req->result = fcntl (req->int1, (int) req->int2, req->ptr2); break;
1890 case EIO_IOCTL: req->result = ioctl (req->int1, (unsigned long)req->int2, req->ptr2); break;
1891
2286 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 1892 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
2287 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break; 1893 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
2288 1894
2289#if HAVE_AT 1895#if HAVE_AT
2290 1896
… …
2294 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break; 1900 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
2295 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break; 1901 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
2296 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break; 1902 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
2297 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break; 1903 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
2298 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break; 1904 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
1905 case EIO_SLURP: eio__slurp ( openat (dirfd, req->ptr1, O_RDONLY | O_CLOEXEC), req); break;
2299 1906
2300 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break; 1907 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
2301 case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break; 1908 case EIO_RMDIR: /* complications arise because "." cannot be removed, so we might have to expand */
1909 req->result = req->wd && SINGLEDOT (req->ptr1)
1910 ? rmdir (req->wd->str)
1911 : unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
2302 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break; 1912 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
2303 case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break; 1913 case EIO_RENAME: req->result = eio__renameat2 (
1914 dirfd,
1915 /* complications arise because "." cannot be renamed, so we might have to expand */
1916 req->wd && SINGLEDOT (req->ptr1) ? req->wd->str : req->ptr1,
1917 WD2FD ((eio_wd)req->int3),
1918 req->ptr2,
1919 req->int2
1920 );
1921 break;
2304 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break; 1922 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
2305 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break; 1923 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
2306 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break; 1924 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2307 case EIO_READLINK: ALLOC (PATH_MAX);
2308 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
2309 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 1925 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2310 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 1926 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1927 case EIO_READLINK: ALLOC (EIO_PATH_MAX);
1928 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, EIO_PATH_MAX);
1929 if (req->result == EIO_PATH_MAX)
1930 {
1931 req->result = -1;
1932 errno = ENAMETOOLONG;
1933 }
1934 break;
2311 case EIO_UTIME: 1935 case EIO_UTIME:
2312 case EIO_FUTIME: 1936 case EIO_FUTIME:
2313 { 1937 {
2314 struct timespec ts[2]; 1938 struct timespec ts[2];
2315 struct timespec *times; 1939 struct timespec *times;
… …
2340 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break; 1964 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2341 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break; 1965 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
2342 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break; 1966 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
2343 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break; 1967 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
2344 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break; 1968 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
1969 case EIO_SLURP: eio__slurp ( open (path , O_RDONLY | O_CLOEXEC), req); break;
2345 1970
2346 case EIO_UNLINK: req->result = unlink (path ); break; 1971 case EIO_UNLINK: req->result = unlink (path ); break;
2347 case EIO_RMDIR: req->result = rmdir (path ); break; 1972 case EIO_RMDIR: req->result = rmdir (path ); break;
2348 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break; 1973 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
2349 case EIO_RENAME: req->result = rename (path , req->ptr2); break; 1974 case EIO_RENAME: req->result = req->int2 ? EIO_ENOSYS () : rename (path, req->ptr2); break;
2350 case EIO_LINK: req->result = link (path , req->ptr2); break; 1975 case EIO_LINK: req->result = link (path , req->ptr2); break;
2351 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break; 1976 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
2352 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break; 1977 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
2353 case EIO_READLINK: ALLOC (PATH_MAX);
2354 req->result = readlink (path, req->ptr2, PATH_MAX); break;
2355 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 1978 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2356 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break; 1979 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
1980 case EIO_READLINK: ALLOC (EIO_PATH_MAX);
1981 req->result = readlink (path, req->ptr2, EIO_PATH_MAX);
1982 if (req->result == EIO_PATH_MAX)
1983 {
1984 req->result = -1;
1985 errno = ENAMETOOLONG;
1986 }
1987 break;
2357 1988
2358 case EIO_UTIME: 1989 case EIO_UTIME:
2359 case EIO_FUTIME: 1990 case EIO_FUTIME:
2360 { 1991 {
2361 struct timeval tv[2]; 1992 struct timeval tv[2];
… …
2396 2027
2397 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break; 2028 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
2398 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break; 2029 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
2399 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break; 2030 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2400 2031
2401 case EIO_CLOSE: req->result = close (req->int1); break; 2032 case EIO_CLOSE: req->result = eio__close (req->int1); break;
2402 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 2033 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
2403 case EIO_SYNC: req->result = 0; sync (); break; 2034 case EIO_SYNC: req->result = 0; sync (); break;
2404 case EIO_FSYNC: req->result = fsync (req->int1); break; 2035 case EIO_FSYNC: req->result = fsync (req->int1); break;
2405 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2036 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2406 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break; 2037 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
… …
2426 req->result = select (0, 0, 0, 0, &tv); 2057 req->result = select (0, 0, 0, 0, &tv);
2427 } 2058 }
2428#endif 2059#endif
2429 break; 2060 break;
2430 2061
2062#if 0
2431 case EIO_GROUP: 2063 case EIO_GROUP:
2432 abort (); /* handled in eio_request */ 2064 abort (); /* handled in eio_request */
2065#endif
2433 2066
2434 case EIO_NOP: 2067 case EIO_NOP:
2435 req->result = 0; 2068 req->result = 0;
2436 break; 2069 break;
2437 2070
… …
2442 default: 2075 default:
2443 req->result = EIO_ENOSYS (); 2076 req->result = EIO_ENOSYS ();
2444 break; 2077 break;
2445 } 2078 }
2446 2079
2080alloc_fail:
2447 req->errorno = errno; 2081 req->errorno = errno;
2448} 2082}
2449 2083
2450#ifndef EIO_NO_WRAPPERS 2084#ifndef EIO_NO_WRAPPERS
2451 2085
… …
2540} 2174}
2541 2175
2542eio_req *eio_write (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data) 2176eio_req *eio_write (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2543{ 2177{
2544 REQ (EIO_WRITE); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND; 2178 REQ (EIO_WRITE); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
2179}
2180
2181eio_req *eio_fcntl (int fd, int cmd, void *arg, int pri, eio_cb cb, void *data)
2182{
2183 REQ (EIO_IOCTL); req->int1 = fd; req->int2 = cmd; req->ptr2 = arg; SEND;
2184}
2185
2186eio_req *eio_ioctl (int fd, unsigned long request, void *buf, int pri, eio_cb cb, void *data)
2187{
2188 REQ (EIO_IOCTL); req->int1 = fd; req->int2 = request; req->ptr2 = buf; SEND;
2545} 2189}
2546 2190
2547eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data) 2191eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data)
2548{ 2192{
2549 REQ (EIO_FSTAT); req->int1 = fd; SEND; 2193 REQ (EIO_FSTAT); req->int1 = fd; SEND;
… …
2694eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data) 2338eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
2695{ 2339{
2696 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 2340 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
2697} 2341}
2698 2342
2343eio_req *eio_slurp (const char *path, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2344{
2345 REQ (EIO_SLURP); PATH; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
2346}
2347
2699eio_req *eio_custom (void (*execute)(eio_req *), int pri, eio_cb cb, void *data) 2348eio_req *eio_custom (void (*execute)(eio_req *), int pri, eio_cb cb, void *data)
2700{ 2349{
2701 REQ (EIO_CUSTOM); req->feed = execute; SEND; 2350 REQ (EIO_CUSTOM); req->feed = execute; SEND;
2702} 2351}
2703 2352
… …
2737void 2386void
2738eio_grp_add (eio_req *grp, eio_req *req) 2387eio_grp_add (eio_req *grp, eio_req *req)
2739{ 2388{
2740 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2)); 2389 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
2741 2390
2742 grp->flags |= EIO_FLAG_GROUPADD; 2391 grp->flags |= ETP_FLAG_GROUPADD;
2743 2392
2744 ++grp->size; 2393 ++grp->size;
2745 req->grp = grp; 2394 req->grp = grp;
2746 2395
2747 req->grp_prev = 0; 2396 req->grp_prev = 0;

Diff Legend

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