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

Comparing libeio/eio.c (file contents):
Revision 1.135 by root, Thu Jun 25 16:39:29 2015 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,2013 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 *
… …
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>
… …
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)
125 #define pipe(fds) _pipe (fds, 4096, O_BINARY) 120 #define pipe(fds) _pipe (fds, 4096, O_BINARY)
126 121
122 #define fcntl(fd,cmd,arg) EIO_ENOSYS ()
123 #define ioctl(fd,cmd,arg) EIO_ENOSYS ()
127 #define fchmod(fd,mode) EIO_ENOSYS () 124 #define fchmod(fd,mode) EIO_ENOSYS ()
128 #define chown(path,uid,gid) EIO_ENOSYS () 125 #define chown(path,uid,gid) EIO_ENOSYS ()
129 #define fchown(fd,uid,gid) EIO_ENOSYS () 126 #define fchown(fd,uid,gid) EIO_ENOSYS ()
130 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */ 127 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
131 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */ 128 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
… …
204 /* we could even stat and see if it exists */ 201 /* we could even stat and see if it exists */
205 static int 202 static int
206 symlink (const char *old, const char *neu) 203 symlink (const char *old, const char *neu)
207 { 204 {
208 #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)
209 if (CreateSymbolicLink (neu, old, 1)) 213 if (CreateSymbolicLink (neu, old, flags))
210 return 0; 214 return 0;
211
212 if (CreateSymbolicLink (neu, old, 0))
213 return 0;
214 #endif 215 #endif
215 216
216 return EIO_ERRNO (ENOENT, -1); 217 return EIO_ERRNO (ENOENT, -1);
217 } 218 }
218 219
… …
230 #define D_NAME(entp) entp.cFileName 231 #define D_NAME(entp) entp.cFileName
231 #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)
232 233
233#else 234#else
234 235
236 #include <sys/ioctl.h>
235 #include <sys/time.h> 237 #include <sys/time.h>
236 #include <sys/select.h> 238 #include <sys/select.h>
237 #include <unistd.h> 239 #include <unistd.h>
238 #include <signal.h> 240 #include <signal.h>
239 #include <dirent.h> 241 #include <dirent.h>
… …
281# include <utime.h> 283# include <utime.h>
282#endif 284#endif
283 285
284#if HAVE_SYS_SYSCALL_H 286#if HAVE_SYS_SYSCALL_H
285# include <sys/syscall.h> 287# include <sys/syscall.h>
286#endif
287
288#if HAVE_SYS_PRCTL_H
289# include <sys/prctl.h>
290#endif 288#endif
291 289
292#if HAVE_SENDFILE 290#if HAVE_SENDFILE
293# if __linux 291# if __linux
294# include <sys/sendfile.h> 292# include <sys/sendfile.h>
… …
302# else 300# else
303# error sendfile support requested but not available 301# error sendfile support requested but not available
304# endif 302# endif
305#endif 303#endif
306 304
305#if HAVE_RENAMEAT2
306# include <sys/syscall.h>
307# include <linux/fs.h>
308#endif
309
307#ifndef D_TYPE 310#ifndef D_TYPE
308# define D_TYPE(de) 0 311# define D_TYPE(de) 0
309#endif 312#endif
310#ifndef D_INO 313#ifndef D_INO
311# define D_INO(de) 0 314# define D_INO(de) 0
… …
319# define NAME_MAX 4096 322# define NAME_MAX 4096
320#endif 323#endif
321 324
322/* used for readlink etc. */ 325/* used for readlink etc. */
323#ifndef PATH_MAX 326#ifndef PATH_MAX
324# define PATH_MAX 4096 327# define PATH_MAX 0
325#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)
326 339
327/* buffer size for various temporary buffers */ 340/* buffer size for various temporary buffers */
328#define EIO_BUFSIZE 65536 341#define EIO_BUFSIZE 65536
329 342
330#define dBUF \ 343#define dBUF \
… …
366#define ETP_PRI_MAX EIO_PRI_MAX 379#define ETP_PRI_MAX EIO_PRI_MAX
367 380
368#define ETP_TYPE_QUIT -1 381#define ETP_TYPE_QUIT -1
369#define ETP_TYPE_GROUP EIO_GROUP 382#define ETP_TYPE_GROUP EIO_GROUP
370 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
371struct etp_worker; 391struct etp_worker;
372
373#define ETP_REQ eio_req 392#define ETP_REQ eio_req
374#define ETP_DESTROY(req) eio_destroy (req) 393#define ETP_DESTROY(req) eio_destroy (req)
375static int eio_finish (eio_req *req); 394static int eio_finish (eio_req *req);
376#define ETP_FINISH(req) eio_finish (req) 395#define ETP_FINISH(req) eio_finish (req)
377static void eio_execute (struct etp_worker *self, eio_req *req); 396static void eio_execute (struct etp_worker *self, eio_req *req);
378#define ETP_EXECUTE(wrk,req) eio_execute (wrk, req) 397#define ETP_EXECUTE(wrk,req) eio_execute (wrk, req)
379 398
380#include "etp.c" 399#include "etp.c"
381 400
401static struct etp_pool eio_pool;
402#define EIO_POOL (&eio_pool)
403
382/*****************************************************************************/ 404/*****************************************************************************/
383 405
384static void 406static void
385grp_try_feed (eio_req *grp) 407grp_try_feed (eio_req *grp)
386{ 408{
387 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 409 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
388 { 410 {
389 grp->flags &= ~EIO_FLAG_GROUPADD; 411 grp->flags &= ~ETP_FLAG_GROUPADD;
390 412
391 EIO_FEED (grp); 413 EIO_FEED (grp);
392 414
393 /* stop if no progress has been made */ 415 /* stop if no progress has been made */
394 if (!(grp->flags & EIO_FLAG_GROUPADD)) 416 if (!(grp->flags & ETP_FLAG_GROUPADD))
395 { 417 {
396 grp->feed = 0; 418 grp->feed = 0;
397 break; 419 break;
398 } 420 }
399 } 421 }
… …
406 428
407 /* call feeder, if applicable */ 429 /* call feeder, if applicable */
408 grp_try_feed (grp); 430 grp_try_feed (grp);
409 431
410 /* finish, if done */ 432 /* finish, if done */
411 if (!grp->size && grp->int1) 433 if (!grp->size && grp->flags & ETP_FLAG_DELAYED)
412 return eio_finish (grp); 434 return eio_finish (grp);
413 else 435 else
414 return 0; 436 return 0;
415} 437}
416 438
… …
452} 474}
453 475
454void 476void
455eio_grp_cancel (eio_req *grp) 477eio_grp_cancel (eio_req *grp)
456{ 478{
457 etp_grp_cancel (grp); 479 etp_grp_cancel (EIO_POOL, grp);
458} 480}
459 481
460void 482void
461eio_cancel (eio_req *req) 483eio_cancel (eio_req *req)
462{ 484{
463 etp_cancel (req); 485 etp_cancel (EIO_POOL, req);
464} 486}
465 487
466void 488void
467eio_submit (eio_req *req) 489eio_submit (eio_req *req)
468{ 490{
469 etp_submit (req); 491 etp_submit (EIO_POOL, req);
470} 492}
471 493
472unsigned int 494unsigned int
473eio_nreqs (void) 495eio_nreqs (void)
474{ 496{
475 return etp_nreqs (); 497 return etp_nreqs (EIO_POOL);
476} 498}
477 499
478unsigned int 500unsigned int
479eio_nready (void) 501eio_nready (void)
480{ 502{
481 return etp_nready (); 503 return etp_nready (EIO_POOL);
482} 504}
483 505
484unsigned int 506unsigned int
485eio_npending (void) 507eio_npending (void)
486{ 508{
487 return etp_npending (); 509 return etp_npending (EIO_POOL);
488} 510}
489 511
490unsigned int ecb_cold 512unsigned int ecb_cold
491eio_nthreads (void) 513eio_nthreads (void)
492{ 514{
493 return etp_nthreads (); 515 return etp_nthreads (EIO_POOL);
494} 516}
495 517
496void ecb_cold 518void ecb_cold
497eio_set_max_poll_time (double nseconds) 519eio_set_max_poll_time (double nseconds)
498{ 520{
499 etp_set_max_poll_time (nseconds); 521 etp_set_max_poll_time (EIO_POOL, nseconds);
500} 522}
501 523
502void ecb_cold 524void ecb_cold
503eio_set_max_poll_reqs (unsigned int maxreqs) 525eio_set_max_poll_reqs (unsigned int maxreqs)
504{ 526{
505 etp_set_max_poll_reqs (maxreqs); 527 etp_set_max_poll_reqs (EIO_POOL, maxreqs);
506} 528}
507 529
508void ecb_cold 530void ecb_cold
509eio_set_max_idle (unsigned int nthreads) 531eio_set_max_idle (unsigned int nthreads)
510{ 532{
511 etp_set_max_idle (nthreads); 533 etp_set_max_idle (EIO_POOL, nthreads);
512} 534}
513 535
514void ecb_cold 536void ecb_cold
515eio_set_idle_timeout (unsigned int seconds) 537eio_set_idle_timeout (unsigned int seconds)
516{ 538{
517 etp_set_idle_timeout (seconds); 539 etp_set_idle_timeout (EIO_POOL, seconds);
518} 540}
519 541
520void ecb_cold 542void ecb_cold
521eio_set_min_parallel (unsigned int nthreads) 543eio_set_min_parallel (unsigned int nthreads)
522{ 544{
523 etp_set_min_parallel (nthreads); 545 etp_set_min_parallel (EIO_POOL, nthreads);
524} 546}
525 547
526void ecb_cold 548void ecb_cold
527eio_set_max_parallel (unsigned int nthreads) 549eio_set_max_parallel (unsigned int nthreads)
528{ 550{
529 etp_set_max_parallel (nthreads); 551 etp_set_max_parallel (EIO_POOL, nthreads);
530} 552}
531 553
532int eio_poll (void) 554int eio_poll (void)
533{ 555{
534 return etp_poll (); 556 return etp_poll (EIO_POOL);
535} 557}
536 558
537/*****************************************************************************/ 559/*****************************************************************************/
538/* 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}
539 576
540#ifndef HAVE_UTIMES 577#ifndef HAVE_UTIMES
541 578
542# undef utimes 579# undef utimes
543# define utimes(path,times) eio__utimes (path, times) 580# define utimes(path,times) eio__utimes (path, times)
… …
922 intptr_t end = addr + len; 959 intptr_t end = addr + len;
923 intptr_t page = eio_pagesize (); 960 intptr_t page = eio_pagesize ();
924 961
925 if (addr < end) 962 if (addr < end)
926 if (flags & EIO_MT_MODIFY) /* modify */ 963 if (flags & EIO_MT_MODIFY) /* modify */
927 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));
928 else 965 else
929 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));
930 } 967 }
931 968
932 return 0; 969 return 0;
933} 970}
934 971
… …
968 1005
969 errno = ENOENT; 1006 errno = ENOENT;
970 if (!*rel) 1007 if (!*rel)
971 return -1; 1008 return -1;
972 1009
973 res = etp_tmpbuf_get (tmpbuf, PATH_MAX * 3); 1010 res = etp_tmpbuf_get (tmpbuf, EIO_PATH_MAX * 3);
974#ifdef _WIN32 1011#ifdef _WIN32
975 if (_access (rel, 4) != 0) 1012 if (_access (rel, 4) != 0)
976 return -1; 1013 return -1;
977 1014
978 symlinks = GetFullPathName (rel, PATH_MAX * 3, res, 0); 1015 symlinks = GetFullPathName (rel, EIO_PATH_MAX * 3, res, 0);
979 1016
980 errno = ENAMETOOLONG; 1017 errno = ENAMETOOLONG;
981 if (symlinks >= PATH_MAX * 3) 1018 if (symlinks >= EIO_PATH_MAX * 3)
982 return -1; 1019 return -1;
983 1020
984 errno = EIO; 1021 errno = EIO;
985 if (symlinks <= 0) 1022 if (symlinks <= 0)
986 return -1; 1023 return -1;
987 1024
988 return symlinks; 1025 return symlinks;
989 1026
990#else 1027#else
991 tmp1 = res + PATH_MAX; 1028 tmp1 = res + EIO_PATH_MAX;
992 tmp2 = tmp1 + PATH_MAX; 1029 tmp2 = tmp1 + EIO_PATH_MAX;
993 1030
994#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 */
995#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1032#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
996 /* on linux we may be able to ask the kernel */ 1033 /* on linux we may be able to ask the kernel */
997 { 1034 {
998 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);
999 1036
1000 if (fd >= 0) 1037 if (fd >= 0)
1001 { 1038 {
1002 sprintf (tmp1, "/proc/self/fd/%d", fd); 1039 sprintf (tmp1, "/proc/self/fd/%d", fd);
1003 req->result = readlink (tmp1, res, PATH_MAX); 1040 req->result = readlink (tmp1, res, EIO_PATH_MAX);
1004 /* 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 */
1005 close (fd); 1042 eio__close (fd);
1006 1043
1007 if (req->result > 0) 1044 if (req->result > 0)
1008 goto done; 1045 goto done;
1009 } 1046 }
1010 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)
… …
1021 if (wd == EIO_INVALID_WD) 1058 if (wd == EIO_INVALID_WD)
1022 return -1; 1059 return -1;
1023 1060
1024 if (wd == EIO_CWD) 1061 if (wd == EIO_CWD)
1025 { 1062 {
1026 if (!getcwd (res, PATH_MAX)) 1063 if (!getcwd (res, EIO_PATH_MAX))
1027 return -1; 1064 return -1;
1028 1065
1029 len = strlen (res); 1066 len = strlen (res);
1030 } 1067 }
1031 else 1068 else
… …
1078 1115
1079 /* zero-terminate, for readlink */ 1116 /* zero-terminate, for readlink */
1080 res [len + 1] = 0; 1117 res [len + 1] = 0;
1081 1118
1082 /* now check if it's a symlink */ 1119 /* now check if it's a symlink */
1083 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX); 1120 linklen = readlink (tmpbuf->ptr, tmp1, EIO_PATH_MAX);
1084 1121
1085 if (linklen < 0) 1122 if (linklen < 0)
1086 { 1123 {
1087 if (errno != EINVAL) 1124 if (errno != EINVAL)
1088 return -1; 1125 return -1;
… …
1094 { 1131 {
1095 /* yay, it was a symlink - build new path in tmp2 */ 1132 /* yay, it was a symlink - build new path in tmp2 */
1096 int rellen = strlen (rel); 1133 int rellen = strlen (rel);
1097 1134
1098 errno = ENAMETOOLONG; 1135 errno = ENAMETOOLONG;
1099 if (linklen + 1 + rellen >= PATH_MAX) 1136 if (linklen + 1 + rellen >= EIO_PATH_MAX) /* also catch linklen >= EIO_PATH_MAX */
1100 return -1; 1137 return -1;
1101 1138
1102 errno = ELOOP; 1139 errno = ELOOP;
1103 if (!--symlinks) 1140 if (!--symlinks)
1104 return -1; 1141 return -1;
… …
1368 return; 1405 return;
1369 1406
1370 dirp = fdopendir (fd); 1407 dirp = fdopendir (fd);
1371 1408
1372 if (!dirp) 1409 if (!dirp)
1373 close (fd); 1410 silent_close (fd);
1374 } 1411 }
1375 else 1412 else
1376 dirp = opendir (req->ptr1); 1413 dirp = opendir (req->ptr1);
1377 #else 1414 #else
1378 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1)); 1415 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
… …
1657eio_wd_close_sync (eio_wd wd) 1694eio_wd_close_sync (eio_wd wd)
1658{ 1695{
1659 if (wd != EIO_INVALID_WD && wd != EIO_CWD) 1696 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
1660 { 1697 {
1661 #if HAVE_AT 1698 #if HAVE_AT
1662 close (wd->fd); 1699 eio__close (wd->fd);
1663 #endif 1700 #endif
1664 free (wd); 1701 free (wd);
1665 } 1702 }
1666} 1703}
1667 1704
1668#if HAVE_AT 1705#if HAVE_AT
1669 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
1670/* they forgot these */ 1720/* they forgot these */
1671 1721
1672static int 1722static int
1673eio__truncateat (int dirfd, const char *path, off_t length) 1723eio__truncateat (int dirfd, const char *path, off_t length)
1674{ 1724{
… …
1677 1727
1678 if (fd < 0) 1728 if (fd < 0)
1679 return fd; 1729 return fd;
1680 1730
1681 res = ftruncate (fd, length); 1731 res = ftruncate (fd, length);
1682 close (fd); 1732 silent_close (fd);
1683 return res; 1733 return res;
1684} 1734}
1685 1735
1686static int 1736static int
1687eio__statvfsat (int dirfd, const char *path, struct statvfs *buf) 1737eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
… …
1691 1741
1692 if (fd < 0) 1742 if (fd < 0)
1693 return fd; 1743 return fd;
1694 1744
1695 res = fstatvfs (fd, buf); 1745 res = fstatvfs (fd, buf);
1696 close (fd); 1746 silent_close (fd);
1697 return res; 1747 return res;
1698
1699} 1748}
1700 1749
1701#endif 1750#endif
1702 1751
1703/*****************************************************************************/ 1752/*****************************************************************************/
1704 1753
1705#define ALLOC(len) \ 1754#define ALLOC(len) \
1706 if (!req->ptr2) \ 1755 if (!req->ptr2) \
1707 { \ 1756 { \
1708 X_LOCK (wrklock); \ 1757 X_LOCK (EIO_POOL->wrklock); \
1709 req->flags |= EIO_FLAG_PTR2_FREE; \ 1758 req->flags |= EIO_FLAG_PTR2_FREE; \
1710 X_UNLOCK (wrklock); \ 1759 X_UNLOCK (EIO_POOL->wrklock); \
1711 req->ptr2 = malloc (len); \ 1760 req->ptr2 = malloc (len); \
1712 if (!req->ptr2) \ 1761 if (!req->ptr2) \
1713 { \ 1762 { \
1714 errno = ENOMEM; \ 1763 errno = ENOMEM; \
1715 req->result = -1; \ 1764 req->result = -1; \
1716 break; \ 1765 goto alloc_fail; \
1717 } \ 1766 } \
1718 } 1767 }
1719 1768
1720static void ecb_noinline ecb_cold 1769/*****************************************************************************/
1721etp_proc_init (void)
1722{
1723#if HAVE_PRCTL_SET_NAME
1724 /* provide a more sensible "thread name" */
1725 char name[16 + 1];
1726 const int namelen = sizeof (name) - 1;
1727 int len;
1728 1770
1729 prctl (PR_GET_NAME, (unsigned long)name, 0, 0, 0); 1771static void
1730 name [namelen] = 0; 1772eio__slurp (int fd, eio_req *req)
1731 len = strlen (name);
1732 strcpy (name + (len <= namelen - 4 ? len : namelen - 4), "/eio");
1733 prctl (PR_SET_NAME, (unsigned long)name, 0, 0, 0);
1734#endif
1735}
1736
1737/* TODO: move somehow to etp.c */
1738X_THREAD_PROC (etp_proc)
1739{ 1773{
1740 ETP_REQ *req; 1774 req->result = fd;
1741 struct timespec ts;
1742 etp_worker *self = (etp_worker *)thr_arg;
1743 1775
1744 etp_proc_init (); 1776 if (fd < 0)
1777 return;
1745 1778
1746 /* try to distribute timeouts somewhat evenly */ 1779 if (req->offs < 0 || !req->size) /* do we need the size? */
1747 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1748
1749 for (;;)
1750 { 1780 {
1751 ts.tv_sec = 0; 1781 off_t size = lseek (fd, 0, SEEK_END);
1752 1782
1753 X_LOCK (reqlock); 1783 if (req->offs < 0)
1784 req->offs += size;
1754 1785
1755 for (;;) 1786 if (!req->size)
1756 { 1787 req->size = size - req->offs;
1757 req = reqq_shift (&req_queue);
1758
1759 if (req)
1760 break;
1761
1762 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
1763 {
1764 X_UNLOCK (reqlock);
1765 X_LOCK (wrklock);
1766 --started;
1767 X_UNLOCK (wrklock);
1768 goto quit;
1769 }
1770
1771 ++idle;
1772
1773 if (idle <= max_idle)
1774 /* we are allowed to idle, so do so without any timeout */
1775 X_COND_WAIT (reqwait, reqlock);
1776 else
1777 {
1778 /* initialise timeout once */
1779 if (!ts.tv_sec)
1780 ts.tv_sec = time (0) + idle_timeout;
1781
1782 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1783 ts.tv_sec = 1; /* assuming this is not a value computed above.,.. */
1784 }
1785
1786 --idle;
1787 }
1788
1789 --nready;
1790
1791 X_UNLOCK (reqlock);
1792
1793 if (req->type == ETP_TYPE_QUIT)
1794 goto quit;
1795
1796 ETP_EXECUTE (self, req);
1797
1798 X_LOCK (reslock);
1799
1800 ++npending;
1801
1802 if (!reqq_push (&res_queue, req) && want_poll_cb)
1803 want_poll_cb ();
1804
1805 etp_worker_clear (self);
1806
1807 X_UNLOCK (reslock);
1808 } 1788 }
1809 1789
1810quit: 1790 ALLOC (req->size);
1811 free (req); 1791 req->result = pread (fd, req->ptr2, req->size, req->offs);
1812 1792
1813 X_LOCK (wrklock); 1793 silent_close (fd);
1814 etp_worker_free (self);
1815 X_UNLOCK (wrklock);
1816 1794
1817 return 0; 1795alloc_fail:
1796 ;
1818} 1797}
1819
1820/*****************************************************************************/
1821 1798
1822int ecb_cold 1799int ecb_cold
1823eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1800eio_init (void (*want_poll)(void), void (*done_poll)(void))
1824{ 1801{
1825 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);
1826} 1806}
1827 1807
1828ecb_inline void 1808ecb_inline void
1829eio_api_destroy (eio_req *req) 1809eio_api_destroy (eio_req *req)
1830{ 1810{
… …
1904 : read (req->int1, req->ptr2, req->size); break; 1884 : read (req->int1, req->ptr2, req->size); break;
1905 case EIO_WRITE: req->result = req->offs >= 0 1885 case EIO_WRITE: req->result = req->offs >= 0
1906 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 1886 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1907 : write (req->int1, req->ptr2, req->size); break; 1887 : write (req->int1, req->ptr2, req->size); break;
1908 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
1909 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;
1910 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;
1911 1894
1912#if HAVE_AT 1895#if HAVE_AT
1913 1896
… …
1917 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;
1918 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;
1919 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;
1920 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;
1921 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;
1922 1906
1923 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break; 1907 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
1924 case EIO_RMDIR: /* complications arise because "." cannot be removed, so we might have to expand */ 1908 case EIO_RMDIR: /* complications arise because "." cannot be removed, so we might have to expand */
1925 req->result = req->wd && SINGLEDOT (req->ptr1) 1909 req->result = req->wd && SINGLEDOT (req->ptr1)
1926 ? rmdir (req->wd->str) 1910 ? rmdir (req->wd->str)
1927 : unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break; 1911 : unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
1928 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;
1913 case EIO_RENAME: req->result = eio__renameat2 (
1914 dirfd,
1929 case EIO_RENAME: /* complications arise because "." cannot be renamed, so we might have to expand */ 1915 /* complications arise because "." cannot be renamed, so we might have to expand */
1930 req->result = req->wd && SINGLEDOT (req->ptr1) 1916 req->wd && SINGLEDOT (req->ptr1) ? req->wd->str : req->ptr1,
1931 ? rename (req->wd->str, req->ptr2) 1917 WD2FD ((eio_wd)req->int3),
1932 : renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break; 1918 req->ptr2,
1919 req->int2
1920 );
1921 break;
1933 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;
1934 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;
1935 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;
1936 case EIO_READLINK: ALLOC (PATH_MAX);
1937 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
1938 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 1925 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1939 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;
1940 case EIO_UTIME: 1935 case EIO_UTIME:
1941 case EIO_FUTIME: 1936 case EIO_FUTIME:
1942 { 1937 {
1943 struct timespec ts[2]; 1938 struct timespec ts[2];
1944 struct timespec *times; 1939 struct timespec *times;
… …
1969 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break; 1964 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
1970 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;
1971 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;
1972 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break; 1967 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
1973 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;
1974 1970
1975 case EIO_UNLINK: req->result = unlink (path ); break; 1971 case EIO_UNLINK: req->result = unlink (path ); break;
1976 case EIO_RMDIR: req->result = rmdir (path ); break; 1972 case EIO_RMDIR: req->result = rmdir (path ); break;
1977 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;
1978 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;
1979 case EIO_LINK: req->result = link (path , req->ptr2); break; 1975 case EIO_LINK: req->result = link (path , req->ptr2); break;
1980 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break; 1976 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
1981 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;
1982 case EIO_READLINK: ALLOC (PATH_MAX);
1983 req->result = readlink (path, req->ptr2, PATH_MAX); break;
1984 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 1978 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1985 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;
1986 1988
1987 case EIO_UTIME: 1989 case EIO_UTIME:
1988 case EIO_FUTIME: 1990 case EIO_FUTIME:
1989 { 1991 {
1990 struct timeval tv[2]; 1992 struct timeval tv[2];
… …
2025 2027
2026 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;
2027 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;
2028 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break; 2030 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2029 2031
2030 case EIO_CLOSE: req->result = close (req->int1); break; 2032 case EIO_CLOSE: req->result = eio__close (req->int1); break;
2031 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 2033 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
2032 case EIO_SYNC: req->result = 0; sync (); break; 2034 case EIO_SYNC: req->result = 0; sync (); break;
2033 case EIO_FSYNC: req->result = fsync (req->int1); break; 2035 case EIO_FSYNC: req->result = fsync (req->int1); break;
2034 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2036 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2035 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break; 2037 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
… …
2073 default: 2075 default:
2074 req->result = EIO_ENOSYS (); 2076 req->result = EIO_ENOSYS ();
2075 break; 2077 break;
2076 } 2078 }
2077 2079
2080alloc_fail:
2078 req->errorno = errno; 2081 req->errorno = errno;
2079} 2082}
2080 2083
2081#ifndef EIO_NO_WRAPPERS 2084#ifndef EIO_NO_WRAPPERS
2082 2085
… …
2171} 2174}
2172 2175
2173eio_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)
2174{ 2177{
2175 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;
2176} 2189}
2177 2190
2178eio_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)
2179{ 2192{
2180 REQ (EIO_FSTAT); req->int1 = fd; SEND; 2193 REQ (EIO_FSTAT); req->int1 = fd; SEND;
… …
2325eio_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)
2326{ 2339{
2327 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 2340 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
2328} 2341}
2329 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
2330eio_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)
2331{ 2349{
2332 REQ (EIO_CUSTOM); req->feed = execute; SEND; 2350 REQ (EIO_CUSTOM); req->feed = execute; SEND;
2333} 2351}
2334 2352
… …
2368void 2386void
2369eio_grp_add (eio_req *grp, eio_req *req) 2387eio_grp_add (eio_req *grp, eio_req *req)
2370{ 2388{
2371 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));
2372 2390
2373 grp->flags |= EIO_FLAG_GROUPADD; 2391 grp->flags |= ETP_FLAG_GROUPADD;
2374 2392
2375 ++grp->size; 2393 ++grp->size;
2376 req->grp = grp; 2394 req->grp = grp;
2377 2395
2378 req->grp_prev = 0; 2396 req->grp_prev = 0;

Diff Legend

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