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.147 by root, Sat Feb 17 15:33:22 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
… …
547} 553}
548 554
549/*****************************************************************************/ 555/*****************************************************************************/
550/* work around various missing functions */ 556/* work around various missing functions */
551 557
558#if HAVE_POSIX_CLOSE && !__linux
559# define eio__close(fd) posix_close (fd, 0)
560#else
561# define eio__close(fd) close (fd)
562#endif
563
564/* close() without disturbing errno */
565static void
566silent_close (int fd)
567{
568 int saved_errno = errno;
569 eio__close (fd);
570 errno = saved_errno;
571}
572
552#ifndef HAVE_UTIMES 573#ifndef HAVE_UTIMES
553 574
554# undef utimes 575# undef utimes
555# define utimes(path,times) eio__utimes (path, times) 576# define utimes(path,times) eio__utimes (path, times)
556 577
… …
1012 if (fd >= 0) 1033 if (fd >= 0)
1013 { 1034 {
1014 sprintf (tmp1, "/proc/self/fd/%d", fd); 1035 sprintf (tmp1, "/proc/self/fd/%d", fd);
1015 req->result = readlink (tmp1, res, EIO_PATH_MAX); 1036 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 */ 1037 /* here we should probably stat the open file and the disk file, to make sure they still match */
1017 close (fd); 1038 eio__close (fd);
1018 1039
1019 if (req->result > 0) 1040 if (req->result > 0)
1020 goto done; 1041 goto done;
1021 } 1042 }
1022 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO) 1043 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO)
… …
1380 return; 1401 return;
1381 1402
1382 dirp = fdopendir (fd); 1403 dirp = fdopendir (fd);
1383 1404
1384 if (!dirp) 1405 if (!dirp)
1385 close (fd); 1406 silent_close (fd);
1386 } 1407 }
1387 else 1408 else
1388 dirp = opendir (req->ptr1); 1409 dirp = opendir (req->ptr1);
1389 #else 1410 #else
1390 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1)); 1411 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
… …
1669eio_wd_close_sync (eio_wd wd) 1690eio_wd_close_sync (eio_wd wd)
1670{ 1691{
1671 if (wd != EIO_INVALID_WD && wd != EIO_CWD) 1692 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
1672 { 1693 {
1673 #if HAVE_AT 1694 #if HAVE_AT
1674 close (wd->fd); 1695 eio__close (wd->fd);
1675 #endif 1696 #endif
1676 free (wd); 1697 free (wd);
1677 } 1698 }
1678} 1699}
1679 1700
1680#if HAVE_AT 1701#if HAVE_AT
1681 1702
1703static int
1704eio__renameat2 (int olddirfd, const char *oldpath, int newdirfd, const char *newpath, unsigned int flags)
1705{
1706#if HAVE_RENAMEAT2
1707 return syscall (SYS_renameat2, olddirfd, oldpath, newdirfd, newpath, flags);
1708#else
1709 if (flags)
1710 return EIO_ENOSYS ();
1711
1712 return renameat (olddirfd, oldpath, newdirfd, newpath);
1713#endif
1714}
1715
1682/* they forgot these */ 1716/* they forgot these */
1683 1717
1684static int 1718static int
1685eio__truncateat (int dirfd, const char *path, off_t length) 1719eio__truncateat (int dirfd, const char *path, off_t length)
1686{ 1720{
… …
1689 1723
1690 if (fd < 0) 1724 if (fd < 0)
1691 return fd; 1725 return fd;
1692 1726
1693 res = ftruncate (fd, length); 1727 res = ftruncate (fd, length);
1694 close (fd); 1728 silent_close (fd);
1695 return res; 1729 return res;
1696} 1730}
1697 1731
1698static int 1732static int
1699eio__statvfsat (int dirfd, const char *path, struct statvfs *buf) 1733eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
… …
1703 1737
1704 if (fd < 0) 1738 if (fd < 0)
1705 return fd; 1739 return fd;
1706 1740
1707 res = fstatvfs (fd, buf); 1741 res = fstatvfs (fd, buf);
1708 close (fd); 1742 silent_close (fd);
1709 return res; 1743 return res;
1710
1711} 1744}
1712 1745
1713#endif 1746#endif
1714 1747
1715/*****************************************************************************/ 1748/*****************************************************************************/
… …
1723 req->ptr2 = malloc (len); \ 1756 req->ptr2 = malloc (len); \
1724 if (!req->ptr2) \ 1757 if (!req->ptr2) \
1725 { \ 1758 { \
1726 errno = ENOMEM; \ 1759 errno = ENOMEM; \
1727 req->result = -1; \ 1760 req->result = -1; \
1728 break; \ 1761 goto alloc_fail; \
1729 } \ 1762 } \
1730 } 1763 }
1731 1764
1732/*****************************************************************************/ 1765/*****************************************************************************/
1766
1767static void
1768eio__slurp (int fd, eio_req *req)
1769{
1770 req->result = fd;
1771
1772 if (fd < 0)
1773 return;
1774
1775 if (req->offs < 0 || !req->size) /* do we need the size? */
1776 {
1777 off_t size = lseek (fd, 0, SEEK_END);
1778
1779 if (req->offs < 0)
1780 req->offs += size;
1781
1782 if (!req->size)
1783 req->size = size - req->offs;
1784 }
1785
1786 ALLOC (req->size);
1787 req->result = pread (fd, req->ptr2, req->size, req->offs);
1788
1789 silent_close (fd);
1790
1791alloc_fail:
1792 ;
1793}
1733 1794
1734int ecb_cold 1795int ecb_cold
1735eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1796eio_init (void (*want_poll)(void), void (*done_poll)(void))
1736{ 1797{
1737 eio_want_poll_cb = want_poll; 1798 eio_want_poll_cb = want_poll;
… …
1835 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break; 1896 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; 1897 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; 1898 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; 1899 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; 1900 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
1901 case EIO_SLURP: eio__slurp ( openat (dirfd, req->ptr1, O_RDONLY | O_CLOEXEC), req); break;
1840 1902
1841 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break; 1903 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 */ 1904 case EIO_RMDIR: /* complications arise because "." cannot be removed, so we might have to expand */
1843 req->result = req->wd && SINGLEDOT (req->ptr1) 1905 req->result = req->wd && SINGLEDOT (req->ptr1)
1844 ? rmdir (req->wd->str) 1906 ? rmdir (req->wd->str)
1845 : unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break; 1907 : unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
1846 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break; 1908 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
1909 case EIO_RENAME: req->result = eio__renameat2 (
1910 dirfd,
1847 case EIO_RENAME: /* complications arise because "." cannot be renamed, so we might have to expand */ 1911 /* complications arise because "." cannot be renamed, so we might have to expand */
1848 req->result = req->wd && SINGLEDOT (req->ptr1) 1912 req->wd && SINGLEDOT (req->ptr1) ? req->wd->str : req->ptr1,
1849 ? rename (req->wd->str, req->ptr2) 1913 WD2FD ((eio_wd)req->int3),
1850 : renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break; 1914 req->ptr2,
1915 req->int2
1916 );
1917 break;
1851 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break; 1918 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; 1919 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; 1920 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)); 1921 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1855 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 1922 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
… …
1893 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break; 1960 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
1894 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break; 1961 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; 1962 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
1896 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break; 1963 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; 1964 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
1965 case EIO_SLURP: eio__slurp ( open (path , O_RDONLY | O_CLOEXEC), req); break;
1898 1966
1899 case EIO_UNLINK: req->result = unlink (path ); break; 1967 case EIO_UNLINK: req->result = unlink (path ); break;
1900 case EIO_RMDIR: req->result = rmdir (path ); break; 1968 case EIO_RMDIR: req->result = rmdir (path ); break;
1901 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break; 1969 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
1902 case EIO_RENAME: req->result = rename (path , req->ptr2); break; 1970 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; 1971 case EIO_LINK: req->result = link (path , req->ptr2); break;
1904 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break; 1972 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; 1973 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)); 1974 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1907 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break; 1975 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
… …
1955 2023
1956 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break; 2024 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; 2025 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; 2026 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1959 2027
1960 case EIO_CLOSE: req->result = close (req->int1); break; 2028 case EIO_CLOSE: req->result = eio__close (req->int1); break;
1961 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 2029 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
1962 case EIO_SYNC: req->result = 0; sync (); break; 2030 case EIO_SYNC: req->result = 0; sync (); break;
1963 case EIO_FSYNC: req->result = fsync (req->int1); break; 2031 case EIO_FSYNC: req->result = fsync (req->int1); break;
1964 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2032 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1965 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break; 2033 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
… …
2003 default: 2071 default:
2004 req->result = EIO_ENOSYS (); 2072 req->result = EIO_ENOSYS ();
2005 break; 2073 break;
2006 } 2074 }
2007 2075
2076alloc_fail:
2008 req->errorno = errno; 2077 req->errorno = errno;
2009} 2078}
2010 2079
2011#ifndef EIO_NO_WRAPPERS 2080#ifndef EIO_NO_WRAPPERS
2012 2081
… …
2265eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data) 2334eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
2266{ 2335{
2267 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 2336 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
2268} 2337}
2269 2338
2339eio_req *eio_slurp (const char *path, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2340{
2341 REQ (EIO_SLURP); PATH; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
2342}
2343
2270eio_req *eio_custom (void (*execute)(eio_req *), int pri, eio_cb cb, void *data) 2344eio_req *eio_custom (void (*execute)(eio_req *), int pri, eio_cb cb, void *data)
2271{ 2345{
2272 REQ (EIO_CUSTOM); req->feed = execute; SEND; 2346 REQ (EIO_CUSTOM); req->feed = execute; SEND;
2273} 2347}
2274 2348

Diff Legend

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