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.153 by root, Fri Aug 17 17:17:07 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
322#endif 332#endif
323 333
324#ifndef EIO_PATH_MIN 334#ifndef EIO_PATH_MIN
325# define EIO_PATH_MIN 8160 335# define EIO_PATH_MIN 8160
326#endif 336#endif
… …
547} 557}
548 558
549/*****************************************************************************/ 559/*****************************************************************************/
550/* work around various missing functions */ 560/* work around various missing functions */
551 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}
576
552#ifndef HAVE_UTIMES 577#ifndef HAVE_UTIMES
553 578
554# undef utimes 579# undef utimes
555# define utimes(path,times) eio__utimes (path, times) 580# define utimes(path,times) eio__utimes (path, times)
556 581
… …
934 intptr_t end = addr + len; 959 intptr_t end = addr + len;
935 intptr_t page = eio_pagesize (); 960 intptr_t page = eio_pagesize ();
936 961
937 if (addr < end) 962 if (addr < end)
938 if (flags & EIO_MT_MODIFY) /* modify */ 963 if (flags & EIO_MT_MODIFY) /* modify */
939 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));
940 else 965 else
941 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));
942 } 967 }
943 968
944 return 0; 969 return 0;
945} 970}
946 971
… …
1012 if (fd >= 0) 1037 if (fd >= 0)
1013 { 1038 {
1014 sprintf (tmp1, "/proc/self/fd/%d", fd); 1039 sprintf (tmp1, "/proc/self/fd/%d", fd);
1015 req->result = readlink (tmp1, res, EIO_PATH_MAX); 1040 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 */ 1041 /* here we should probably stat the open file and the disk file, to make sure they still match */
1017 close (fd); 1042 eio__close (fd);
1018 1043
1019 if (req->result > 0) 1044 if (req->result > 0)
1020 goto done; 1045 goto done;
1021 } 1046 }
1022 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)
… …
1370 return; 1395 return;
1371 } 1396 }
1372 } 1397 }
1373#else 1398#else
1374 #if HAVE_AT 1399 #if HAVE_AT
1375 if (req->wd)
1376 { 1400 {
1377 int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC | O_SEARCH | O_DIRECTORY); 1401 int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1378 1402
1379 if (fd < 0) 1403 if (fd < 0)
1404 return;
1405
1406 dirp = fdopendir (fd);
1407
1408 if (!dirp)
1409 {
1410 silent_close (fd);
1380 return; 1411 return;
1381
1382 dirp = fdopendir (fd);
1383
1384 if (!dirp)
1385 close (fd);
1386 } 1412 }
1387 else 1413 }
1388 dirp = opendir (req->ptr1);
1389 #else 1414 #else
1390 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1)); 1415 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
1416
1417 if (!dirp)
1418 return;
1391 #endif 1419 #endif
1392
1393 if (!dirp)
1394 return;
1395#endif 1420#endif
1396 1421
1397 if (req->flags & EIO_FLAG_PTR1_FREE) 1422 if (req->flags & EIO_FLAG_PTR1_FREE)
1398 free (req->ptr1); 1423 free (req->ptr1);
1399 1424
… …
1656} 1681}
1657 1682
1658eio_wd 1683eio_wd
1659eio_wd_open_sync (eio_wd wd, const char *path) 1684eio_wd_open_sync (eio_wd wd, const char *path)
1660{ 1685{
1661 struct etp_tmpbuf tmpbuf = { }; 1686 struct etp_tmpbuf tmpbuf = { 0 };
1662 wd = eio__wd_open_sync (&tmpbuf, wd, path); 1687 wd = eio__wd_open_sync (&tmpbuf, wd, path);
1663 free (tmpbuf.ptr); 1688 free (tmpbuf.ptr);
1664 1689
1665 return wd; 1690 return wd;
1666} 1691}
… …
1669eio_wd_close_sync (eio_wd wd) 1694eio_wd_close_sync (eio_wd wd)
1670{ 1695{
1671 if (wd != EIO_INVALID_WD && wd != EIO_CWD) 1696 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
1672 { 1697 {
1673 #if HAVE_AT 1698 #if HAVE_AT
1674 close (wd->fd); 1699 eio__close (wd->fd);
1675 #endif 1700 #endif
1676 free (wd); 1701 free (wd);
1677 } 1702 }
1678} 1703}
1679 1704
1680#if HAVE_AT 1705#if HAVE_AT
1681 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
1682/* they forgot these */ 1720/* they forgot these */
1683 1721
1684static int 1722static int
1685eio__truncateat (int dirfd, const char *path, off_t length) 1723eio__truncateat (int dirfd, const char *path, off_t length)
1686{ 1724{
… …
1689 1727
1690 if (fd < 0) 1728 if (fd < 0)
1691 return fd; 1729 return fd;
1692 1730
1693 res = ftruncate (fd, length); 1731 res = ftruncate (fd, length);
1694 close (fd); 1732 silent_close (fd);
1695 return res; 1733 return res;
1696} 1734}
1697 1735
1698static int 1736static int
1699eio__statvfsat (int dirfd, const char *path, struct statvfs *buf) 1737eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
… …
1703 1741
1704 if (fd < 0) 1742 if (fd < 0)
1705 return fd; 1743 return fd;
1706 1744
1707 res = fstatvfs (fd, buf); 1745 res = fstatvfs (fd, buf);
1708 close (fd); 1746 silent_close (fd);
1709 return res; 1747 return res;
1710
1711} 1748}
1712 1749
1713#endif 1750#endif
1714 1751
1715/*****************************************************************************/ 1752/*****************************************************************************/
… …
1723 req->ptr2 = malloc (len); \ 1760 req->ptr2 = malloc (len); \
1724 if (!req->ptr2) \ 1761 if (!req->ptr2) \
1725 { \ 1762 { \
1726 errno = ENOMEM; \ 1763 errno = ENOMEM; \
1727 req->result = -1; \ 1764 req->result = -1; \
1728 break; \ 1765 goto alloc_fail; \
1729 } \ 1766 } \
1730 } 1767 }
1731 1768
1732/*****************************************************************************/ 1769/*****************************************************************************/
1770
1771static void
1772eio__slurp (int fd, eio_req *req)
1773{
1774 req->result = fd;
1775
1776 if (fd < 0)
1777 return;
1778
1779 if (req->offs < 0 || !req->size) /* do we need the size? */
1780 {
1781 off_t size = lseek (fd, 0, SEEK_END);
1782
1783 if (req->offs < 0)
1784 req->offs += size;
1785
1786 if (!req->size)
1787 req->size = size - req->offs;
1788 }
1789
1790 ALLOC (req->size);
1791 req->result = pread (fd, req->ptr2, req->size, req->offs);
1792
1793 silent_close (fd);
1794
1795alloc_fail:
1796 ;
1797}
1733 1798
1734int ecb_cold 1799int ecb_cold
1735eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1800eio_init (void (*want_poll)(void), void (*done_poll)(void))
1736{ 1801{
1737 eio_want_poll_cb = want_poll; 1802 eio_want_poll_cb = want_poll;
… …
1835 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;
1836 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;
1837 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;
1838 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;
1839 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;
1840 1906
1841 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break; 1907 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 */ 1908 case EIO_RMDIR: /* complications arise because "." cannot be removed, so we might have to expand */
1843 req->result = req->wd && SINGLEDOT (req->ptr1) 1909 req->result = req->wd && SINGLEDOT (req->ptr1)
1844 ? rmdir (req->wd->str) 1910 ? rmdir (req->wd->str)
1845 : unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break; 1911 : unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
1846 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,
1847 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 */
1848 req->result = req->wd && SINGLEDOT (req->ptr1) 1916 req->wd && SINGLEDOT (req->ptr1) ? req->wd->str : req->ptr1,
1849 ? rename (req->wd->str, req->ptr2) 1917 WD2FD ((eio_wd)req->int3),
1850 : renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break; 1918 req->ptr2,
1919 req->int2
1920 );
1921 break;
1851 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;
1852 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;
1853 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;
1854 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 1925 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1855 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;
… …
1893 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break; 1964 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
1894 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;
1895 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;
1896 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break; 1967 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; 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;
1898 1970
1899 case EIO_UNLINK: req->result = unlink (path ); break; 1971 case EIO_UNLINK: req->result = unlink (path ); break;
1900 case EIO_RMDIR: req->result = rmdir (path ); break; 1972 case EIO_RMDIR: req->result = rmdir (path ); break;
1901 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;
1902 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;
1903 case EIO_LINK: req->result = link (path , req->ptr2); break; 1975 case EIO_LINK: req->result = link (path , req->ptr2); break;
1904 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break; 1976 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; 1977 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)); 1978 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1907 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break; 1979 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
… …
1955 2027
1956 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;
1957 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;
1958 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break; 2030 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1959 2031
1960 case EIO_CLOSE: req->result = close (req->int1); break; 2032 case EIO_CLOSE: req->result = eio__close (req->int1); break;
1961 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 2033 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
1962 case EIO_SYNC: req->result = 0; sync (); break; 2034 case EIO_SYNC: req->result = 0; sync (); break;
1963 case EIO_FSYNC: req->result = fsync (req->int1); break; 2035 case EIO_FSYNC: req->result = fsync (req->int1); break;
1964 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2036 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1965 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break; 2037 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
… …
2003 default: 2075 default:
2004 req->result = EIO_ENOSYS (); 2076 req->result = EIO_ENOSYS ();
2005 break; 2077 break;
2006 } 2078 }
2007 2079
2080alloc_fail:
2008 req->errorno = errno; 2081 req->errorno = errno;
2009} 2082}
2010 2083
2011#ifndef EIO_NO_WRAPPERS 2084#ifndef EIO_NO_WRAPPERS
2012 2085
… …
2265eio_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)
2266{ 2339{
2267 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 2340 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
2268} 2341}
2269 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
2270eio_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)
2271{ 2349{
2272 REQ (EIO_CUSTOM); req->feed = execute; SEND; 2350 REQ (EIO_CUSTOM); req->feed = execute; SEND;
2273} 2351}
2274 2352

Diff Legend

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