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

Comparing libeio/eio.c (file contents):
Revision 1.144 by root, Tue Dec 27 09:58:44 2016 UTC vs.
Revision 1.154 by root, Fri Aug 17 17:27:27 2018 UTC

1/* 1/*
2 * libeio implementation 2 * libeio implementation
3 * 3 *
4 * Copyright (c) 2007,2008,2009,2010,2011,2012,2013,2016 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 *
… …
231 #define D_NAME(entp) entp.cFileName 231 #define D_NAME(entp) entp.cFileName
232 #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)
233 233
234#else 234#else
235 235
236 #include <sys/ioctl.h>
236 #include <sys/time.h> 237 #include <sys/time.h>
237 #include <sys/select.h> 238 #include <sys/select.h>
238 #include <unistd.h> 239 #include <unistd.h>
239 #include <signal.h> 240 #include <signal.h>
240 #include <dirent.h> 241 #include <dirent.h>
… …
299# else 300# else
300# error sendfile support requested but not available 301# error sendfile support requested but not available
301# endif 302# endif
302#endif 303#endif
303 304
305#if HAVE_RENAMEAT2
306# include <sys/syscall.h>
307# include <linux/fs.h>
308#endif
309
304#ifndef D_TYPE 310#ifndef D_TYPE
305# define D_TYPE(de) 0 311# define D_TYPE(de) 0
306#endif 312#endif
307#ifndef D_INO 313#ifndef D_INO
308# define D_INO(de) 0 314# define D_INO(de) 0
… …
317#endif 323#endif
318 324
319/* used for readlink etc. */ 325/* used for readlink etc. */
320#ifndef PATH_MAX 326#ifndef PATH_MAX
321# define PATH_MAX 0 327# define PATH_MAX 0
328#endif
329
330#ifndef O_CLOEXEC
331 #define O_CLOEXEC 0
332#endif
333
334#ifndef O_NONBLOCK
335 #define O_NONBLOCK 0
336#endif
337
338#ifndef O_SEARCH
339 #define O_SEARCH O_RDONLY
340#endif
341
342#ifndef O_DIRECTORY
343 #define O_DIRECTORY 0
322#endif 344#endif
323 345
324#ifndef EIO_PATH_MIN 346#ifndef EIO_PATH_MIN
325# define EIO_PATH_MIN 8160 347# define EIO_PATH_MIN 8160
326#endif 348#endif
… …
344struct etp_tmpbuf; 366struct etp_tmpbuf;
345 367
346#if _POSIX_VERSION >= 200809L 368#if _POSIX_VERSION >= 200809L
347 #define HAVE_AT 1 369 #define HAVE_AT 1
348 #define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD) 370 #define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD)
349 #ifndef O_SEARCH
350 #define O_SEARCH O_RDONLY
351 #endif
352#else 371#else
353 #define HAVE_AT 0 372 #define HAVE_AT 0
354 static const char *wd_expand (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path); 373 static const char *wd_expand (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path);
355#endif 374#endif
356 375
… …
546 return etp_poll (EIO_POOL); 565 return etp_poll (EIO_POOL);
547} 566}
548 567
549/*****************************************************************************/ 568/*****************************************************************************/
550/* work around various missing functions */ 569/* work around various missing functions */
570
571#if HAVE_POSIX_CLOSE && !__linux
572# define eio__close(fd) posix_close (fd, 0)
573#else
574# define eio__close(fd) close (fd)
575#endif
576
577/* close() without disturbing errno */
578static void
579silent_close (int fd)
580{
581 int saved_errno = errno;
582 eio__close (fd);
583 errno = saved_errno;
584}
551 585
552#ifndef HAVE_UTIMES 586#ifndef HAVE_UTIMES
553 587
554# undef utimes 588# undef utimes
555# define utimes(path,times) eio__utimes (path, times) 589# define utimes(path,times) eio__utimes (path, times)
… …
934 intptr_t end = addr + len; 968 intptr_t end = addr + len;
935 intptr_t page = eio_pagesize (); 969 intptr_t page = eio_pagesize ();
936 970
937 if (addr < end) 971 if (addr < end)
938 if (flags & EIO_MT_MODIFY) /* modify */ 972 if (flags & EIO_MT_MODIFY) /* modify */
939 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len && !EIO_CANCELLED (req)); 973 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < end && !EIO_CANCELLED (req));
940 else 974 else
941 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len && !EIO_CANCELLED (req)); 975 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < end && !EIO_CANCELLED (req));
942 } 976 }
943 977
944 return 0; 978 return 0;
945} 979}
946 980
… …
1012 if (fd >= 0) 1046 if (fd >= 0)
1013 { 1047 {
1014 sprintf (tmp1, "/proc/self/fd/%d", fd); 1048 sprintf (tmp1, "/proc/self/fd/%d", fd);
1015 req->result = readlink (tmp1, res, EIO_PATH_MAX); 1049 req->result = readlink (tmp1, res, EIO_PATH_MAX);
1016 /* here we should probably stat the open file and the disk file, to make sure they still match */ 1050 /* here we should probably stat the open file and the disk file, to make sure they still match */
1017 close (fd); 1051 eio__close (fd);
1018 1052
1019 if (req->result > 0) 1053 if (req->result > 0)
1020 goto done; 1054 goto done;
1021 } 1055 }
1022 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO) 1056 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO)
… …
1370 return; 1404 return;
1371 } 1405 }
1372 } 1406 }
1373#else 1407#else
1374 #if HAVE_AT 1408 #if HAVE_AT
1375 if (req->wd)
1376 { 1409 {
1377 int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC | O_SEARCH | O_DIRECTORY); 1410 int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC | O_SEARCH | O_DIRECTORY | O_NONBLOCK);
1378 1411
1379 if (fd < 0) 1412 if (fd < 0)
1413 return;
1414
1415 dirp = fdopendir (fd);
1416
1417 if (!dirp)
1418 {
1419 silent_close (fd);
1380 return; 1420 return;
1381
1382 dirp = fdopendir (fd);
1383
1384 if (!dirp)
1385 close (fd);
1386 } 1421 }
1387 else 1422 }
1388 dirp = opendir (req->ptr1);
1389 #else 1423 #else
1390 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1)); 1424 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
1425
1426 if (!dirp)
1427 return;
1391 #endif 1428 #endif
1392
1393 if (!dirp)
1394 return;
1395#endif 1429#endif
1396 1430
1397 if (req->flags & EIO_FLAG_PTR1_FREE) 1431 if (req->flags & EIO_FLAG_PTR1_FREE)
1398 free (req->ptr1); 1432 free (req->ptr1);
1399 1433
… …
1634 1668
1635 if (len < 0) 1669 if (len < 0)
1636 return EIO_INVALID_WD; 1670 return EIO_INVALID_WD;
1637 1671
1638#if HAVE_AT 1672#if HAVE_AT
1639 fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY); 1673 fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY | O_NONBLOCK);
1640 1674
1641 if (fd < 0) 1675 if (fd < 0)
1642 return EIO_INVALID_WD; 1676 return EIO_INVALID_WD;
1643#endif 1677#endif
1644 1678
… …
1656} 1690}
1657 1691
1658eio_wd 1692eio_wd
1659eio_wd_open_sync (eio_wd wd, const char *path) 1693eio_wd_open_sync (eio_wd wd, const char *path)
1660{ 1694{
1661 struct etp_tmpbuf tmpbuf = { }; 1695 struct etp_tmpbuf tmpbuf = { 0 };
1662 wd = eio__wd_open_sync (&tmpbuf, wd, path); 1696 wd = eio__wd_open_sync (&tmpbuf, wd, path);
1663 free (tmpbuf.ptr); 1697 free (tmpbuf.ptr);
1664 1698
1665 return wd; 1699 return wd;
1666} 1700}
… …
1669eio_wd_close_sync (eio_wd wd) 1703eio_wd_close_sync (eio_wd wd)
1670{ 1704{
1671 if (wd != EIO_INVALID_WD && wd != EIO_CWD) 1705 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
1672 { 1706 {
1673 #if HAVE_AT 1707 #if HAVE_AT
1674 close (wd->fd); 1708 eio__close (wd->fd);
1675 #endif 1709 #endif
1676 free (wd); 1710 free (wd);
1677 } 1711 }
1678} 1712}
1679 1713
1680#if HAVE_AT 1714#if HAVE_AT
1681 1715
1716static int
1717eio__renameat2 (int olddirfd, const char *oldpath, int newdirfd, const char *newpath, unsigned int flags)
1718{
1719#if HAVE_RENAMEAT2
1720 return syscall (SYS_renameat2, olddirfd, oldpath, newdirfd, newpath, flags);
1721#else
1722 if (flags)
1723 return EIO_ENOSYS ();
1724
1725 return renameat (olddirfd, oldpath, newdirfd, newpath);
1726#endif
1727}
1728
1682/* they forgot these */ 1729/* they forgot these */
1683 1730
1684static int 1731static int
1685eio__truncateat (int dirfd, const char *path, off_t length) 1732eio__truncateat (int dirfd, const char *path, off_t length)
1686{ 1733{
1687 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC); 1734 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC | O_NONBLOCK);
1688 int res; 1735 int res;
1689 1736
1690 if (fd < 0) 1737 if (fd < 0)
1691 return fd; 1738 return fd;
1692 1739
1693 res = ftruncate (fd, length); 1740 res = ftruncate (fd, length);
1694 close (fd); 1741 silent_close (fd);
1695 return res; 1742 return res;
1696} 1743}
1697 1744
1698static int 1745static int
1699eio__statvfsat (int dirfd, const char *path, struct statvfs *buf) 1746eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
1700{ 1747{
1701 int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC); 1748 int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC | O_NONBLOCK);
1702 int res; 1749 int res;
1703 1750
1704 if (fd < 0) 1751 if (fd < 0)
1705 return fd; 1752 return fd;
1706 1753
1707 res = fstatvfs (fd, buf); 1754 res = fstatvfs (fd, buf);
1708 close (fd); 1755 silent_close (fd);
1709 return res; 1756 return res;
1710
1711} 1757}
1712 1758
1713#endif 1759#endif
1714 1760
1715/*****************************************************************************/ 1761/*****************************************************************************/
… …
1723 req->ptr2 = malloc (len); \ 1769 req->ptr2 = malloc (len); \
1724 if (!req->ptr2) \ 1770 if (!req->ptr2) \
1725 { \ 1771 { \
1726 errno = ENOMEM; \ 1772 errno = ENOMEM; \
1727 req->result = -1; \ 1773 req->result = -1; \
1728 break; \ 1774 goto alloc_fail; \
1729 } \ 1775 } \
1730 } 1776 }
1731 1777
1732/*****************************************************************************/ 1778/*****************************************************************************/
1779
1780static void
1781eio__slurp (int fd, eio_req *req)
1782{
1783 req->result = fd;
1784
1785 if (fd < 0)
1786 return;
1787
1788 if (req->offs < 0 || !req->size) /* do we need the size? */
1789 {
1790 off_t size = lseek (fd, 0, SEEK_END);
1791
1792 if (req->offs < 0)
1793 req->offs += size;
1794
1795 if (!req->size)
1796 req->size = size - req->offs;
1797 }
1798
1799 ALLOC (req->size);
1800 req->result = pread (fd, req->ptr2, req->size, req->offs);
1801
1802 silent_close (fd);
1803
1804alloc_fail:
1805 ;
1806}
1733 1807
1734int ecb_cold 1808int ecb_cold
1735eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1809eio_init (void (*want_poll)(void), void (*done_poll)(void))
1736{ 1810{
1737 eio_want_poll_cb = want_poll; 1811 eio_want_poll_cb = want_poll;
… …
1835 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break; 1909 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
1836 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break; 1910 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
1837 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break; 1911 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
1838 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break; 1912 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
1839 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break; 1913 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
1914 case EIO_SLURP: eio__slurp ( openat (dirfd, req->ptr1, O_RDONLY | O_CLOEXEC), req); break;
1840 1915
1841 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break; 1916 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
1842 case EIO_RMDIR: /* complications arise because "." cannot be removed, so we might have to expand */ 1917 case EIO_RMDIR: /* complications arise because "." cannot be removed, so we might have to expand */
1843 req->result = req->wd && SINGLEDOT (req->ptr1) 1918 req->result = req->wd && SINGLEDOT (req->ptr1)
1844 ? rmdir (req->wd->str) 1919 ? rmdir (req->wd->str)
1845 : unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break; 1920 : unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
1846 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break; 1921 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
1922 case EIO_RENAME: req->result = eio__renameat2 (
1923 dirfd,
1847 case EIO_RENAME: /* complications arise because "." cannot be renamed, so we might have to expand */ 1924 /* complications arise because "." cannot be renamed, so we might have to expand */
1848 req->result = req->wd && SINGLEDOT (req->ptr1) 1925 req->wd && SINGLEDOT (req->ptr1) ? req->wd->str : req->ptr1,
1849 ? rename (req->wd->str, req->ptr2) 1926 WD2FD ((eio_wd)req->int3),
1850 : renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break; 1927 req->ptr2,
1928 req->int2
1929 );
1930 break;
1851 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break; 1931 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
1852 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break; 1932 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
1853 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break; 1933 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1854 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 1934 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1855 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 1935 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
… …
1893 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break; 1973 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
1894 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break; 1974 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
1895 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break; 1975 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
1896 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break; 1976 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
1897 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break; 1977 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
1978 case EIO_SLURP: eio__slurp ( open (path , O_RDONLY | O_CLOEXEC), req); break;
1898 1979
1899 case EIO_UNLINK: req->result = unlink (path ); break; 1980 case EIO_UNLINK: req->result = unlink (path ); break;
1900 case EIO_RMDIR: req->result = rmdir (path ); break; 1981 case EIO_RMDIR: req->result = rmdir (path ); break;
1901 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break; 1982 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
1902 case EIO_RENAME: req->result = rename (path , req->ptr2); break; 1983 case EIO_RENAME: req->result = req->int2 ? EIO_ENOSYS () : rename (path, req->ptr2); break;
1903 case EIO_LINK: req->result = link (path , req->ptr2); break; 1984 case EIO_LINK: req->result = link (path , req->ptr2); break;
1904 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break; 1985 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
1905 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break; 1986 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
1906 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 1987 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1907 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break; 1988 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
… …
1955 2036
1956 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break; 2037 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1957 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break; 2038 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
1958 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break; 2039 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1959 2040
1960 case EIO_CLOSE: req->result = close (req->int1); break; 2041 case EIO_CLOSE: req->result = eio__close (req->int1); break;
1961 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 2042 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
1962 case EIO_SYNC: req->result = 0; sync (); break; 2043 case EIO_SYNC: req->result = 0; sync (); break;
1963 case EIO_FSYNC: req->result = fsync (req->int1); break; 2044 case EIO_FSYNC: req->result = fsync (req->int1); break;
1964 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2045 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1965 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break; 2046 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
… …
2003 default: 2084 default:
2004 req->result = EIO_ENOSYS (); 2085 req->result = EIO_ENOSYS ();
2005 break; 2086 break;
2006 } 2087 }
2007 2088
2089alloc_fail:
2008 req->errorno = errno; 2090 req->errorno = errno;
2009} 2091}
2010 2092
2011#ifndef EIO_NO_WRAPPERS 2093#ifndef EIO_NO_WRAPPERS
2012 2094
… …
2265eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data) 2347eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
2266{ 2348{
2267 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 2349 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
2268} 2350}
2269 2351
2352eio_req *eio_slurp (const char *path, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2353{
2354 REQ (EIO_SLURP); PATH; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
2355}
2356
2270eio_req *eio_custom (void (*execute)(eio_req *), int pri, eio_cb cb, void *data) 2357eio_req *eio_custom (void (*execute)(eio_req *), int pri, eio_cb cb, void *data)
2271{ 2358{
2272 REQ (EIO_CUSTOM); req->feed = execute; SEND; 2359 REQ (EIO_CUSTOM); req->feed = execute; SEND;
2273} 2360}
2274 2361

Diff Legend

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