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

Comparing libeio/eio.c (file contents):
Revision 1.145 by root, Fri Jun 23 03:10:19 2017 UTC vs.
Revision 1.146 by root, Sat Jan 6 01:04:43 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 *
… …
553} 553}
554 554
555/*****************************************************************************/ 555/*****************************************************************************/
556/* work around various missing functions */ 556/* work around various missing functions */
557 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
558#ifndef HAVE_UTIMES 573#ifndef HAVE_UTIMES
559 574
560# undef utimes 575# undef utimes
561# define utimes(path,times) eio__utimes (path, times) 576# define utimes(path,times) eio__utimes (path, times)
562 577
… …
1018 if (fd >= 0) 1033 if (fd >= 0)
1019 { 1034 {
1020 sprintf (tmp1, "/proc/self/fd/%d", fd); 1035 sprintf (tmp1, "/proc/self/fd/%d", fd);
1021 req->result = readlink (tmp1, res, EIO_PATH_MAX); 1036 req->result = readlink (tmp1, res, EIO_PATH_MAX);
1022 /* 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 */
1023 close (fd); 1038 eio__close (fd);
1024 1039
1025 if (req->result > 0) 1040 if (req->result > 0)
1026 goto done; 1041 goto done;
1027 } 1042 }
1028 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)
… …
1386 return; 1401 return;
1387 1402
1388 dirp = fdopendir (fd); 1403 dirp = fdopendir (fd);
1389 1404
1390 if (!dirp) 1405 if (!dirp)
1391 close (fd); 1406 silent_close (fd);
1392 } 1407 }
1393 else 1408 else
1394 dirp = opendir (req->ptr1); 1409 dirp = opendir (req->ptr1);
1395 #else 1410 #else
1396 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1)); 1411 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
… …
1675eio_wd_close_sync (eio_wd wd) 1690eio_wd_close_sync (eio_wd wd)
1676{ 1691{
1677 if (wd != EIO_INVALID_WD && wd != EIO_CWD) 1692 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
1678 { 1693 {
1679 #if HAVE_AT 1694 #if HAVE_AT
1680 close (wd->fd); 1695 eio__close (wd->fd);
1681 #endif 1696 #endif
1682 free (wd); 1697 free (wd);
1683 } 1698 }
1684} 1699}
1685 1700
… …
1708 1723
1709 if (fd < 0) 1724 if (fd < 0)
1710 return fd; 1725 return fd;
1711 1726
1712 res = ftruncate (fd, length); 1727 res = ftruncate (fd, length);
1713 close (fd); 1728 silent_close (fd);
1714 return res; 1729 return res;
1715} 1730}
1716 1731
1717static int 1732static int
1718eio__statvfsat (int dirfd, const char *path, struct statvfs *buf) 1733eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
… …
1722 1737
1723 if (fd < 0) 1738 if (fd < 0)
1724 return fd; 1739 return fd;
1725 1740
1726 res = fstatvfs (fd, buf); 1741 res = fstatvfs (fd, buf);
1727 close (fd); 1742 silent_close (fd);
1728 return res; 1743 return res;
1729
1730} 1744}
1731 1745
1732#endif 1746#endif
1733 1747
1734/*****************************************************************************/ 1748/*****************************************************************************/
… …
1742 req->ptr2 = malloc (len); \ 1756 req->ptr2 = malloc (len); \
1743 if (!req->ptr2) \ 1757 if (!req->ptr2) \
1744 { \ 1758 { \
1745 errno = ENOMEM; \ 1759 errno = ENOMEM; \
1746 req->result = -1; \ 1760 req->result = -1; \
1747 break; \ 1761 goto alloc_fail; \
1748 } \ 1762 } \
1749 } 1763 }
1750 1764
1751/*****************************************************************************/ 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}
1752 1794
1753int ecb_cold 1795int ecb_cold
1754eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1796eio_init (void (*want_poll)(void), void (*done_poll)(void))
1755{ 1797{
1756 eio_want_poll_cb = want_poll; 1798 eio_want_poll_cb = want_poll;
… …
1854 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;
1855 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;
1856 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;
1857 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;
1858 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;
1859 1902
1860 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break; 1903 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
1861 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 */
1862 req->result = req->wd && SINGLEDOT (req->ptr1) 1905 req->result = req->wd && SINGLEDOT (req->ptr1)
1863 ? rmdir (req->wd->str) 1906 ? rmdir (req->wd->str)
… …
1917 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break; 1960 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
1918 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;
1919 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;
1920 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break; 1963 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
1921 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;
1922 1966
1923 case EIO_UNLINK: req->result = unlink (path ); break; 1967 case EIO_UNLINK: req->result = unlink (path ); break;
1924 case EIO_RMDIR: req->result = rmdir (path ); break; 1968 case EIO_RMDIR: req->result = rmdir (path ); break;
1925 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;
1926 case EIO_RENAME: req->result = req->int2 ? EIO_ENOSYS () : rename (path, req->ptr2); break; 1970 case EIO_RENAME: req->result = req->int2 ? EIO_ENOSYS () : rename (path, req->ptr2); break;
… …
1979 2023
1980 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;
1981 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;
1982 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break; 2026 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1983 2027
1984 case EIO_CLOSE: req->result = close (req->int1); break; 2028 case EIO_CLOSE: req->result = eio__close (req->int1); break;
1985 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 2029 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
1986 case EIO_SYNC: req->result = 0; sync (); break; 2030 case EIO_SYNC: req->result = 0; sync (); break;
1987 case EIO_FSYNC: req->result = fsync (req->int1); break; 2031 case EIO_FSYNC: req->result = fsync (req->int1); break;
1988 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2032 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1989 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break; 2033 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
… …
2027 default: 2071 default:
2028 req->result = EIO_ENOSYS (); 2072 req->result = EIO_ENOSYS ();
2029 break; 2073 break;
2030 } 2074 }
2031 2075
2076alloc_fail:
2032 req->errorno = errno; 2077 req->errorno = errno;
2033} 2078}
2034 2079
2035#ifndef EIO_NO_WRAPPERS 2080#ifndef EIO_NO_WRAPPERS
2036 2081
… …
2289eio_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)
2290{ 2335{
2291 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 2336 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
2292} 2337}
2293 2338
2339eio_req *eio_slurp (const char *path, void *buf, ssize_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
2294eio_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)
2295{ 2345{
2296 REQ (EIO_CUSTOM); req->feed = execute; SEND; 2346 REQ (EIO_CUSTOM); req->feed = execute; SEND;
2297} 2347}
2298 2348

Diff Legend

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