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.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,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 *
… …
325/* used for readlink etc. */ 325/* used for readlink etc. */
326#ifndef PATH_MAX 326#ifndef PATH_MAX
327# define PATH_MAX 0 327# define PATH_MAX 0
328#endif 328#endif
329 329
330#ifndef O_CLOEXEC
331 #define O_CLOEXEC 0
332#endif
333
330#ifndef EIO_PATH_MIN 334#ifndef EIO_PATH_MIN
331# define EIO_PATH_MIN 8160 335# define EIO_PATH_MIN 8160
332#endif 336#endif
333 337
334#define EIO_PATH_MAX (PATH_MAX <= EIO_PATH_MIN ? EIO_PATH_MIN : PATH_MAX) 338#define EIO_PATH_MAX (PATH_MAX <= EIO_PATH_MIN ? EIO_PATH_MIN : PATH_MAX)
… …
553} 557}
554 558
555/*****************************************************************************/ 559/*****************************************************************************/
556/* work around various missing functions */ 560/* work around various missing functions */
557 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
558#ifndef HAVE_UTIMES 577#ifndef HAVE_UTIMES
559 578
560# undef utimes 579# undef utimes
561# define utimes(path,times) eio__utimes (path, times) 580# define utimes(path,times) eio__utimes (path, times)
562 581
… …
940 intptr_t end = addr + len; 959 intptr_t end = addr + len;
941 intptr_t page = eio_pagesize (); 960 intptr_t page = eio_pagesize ();
942 961
943 if (addr < end) 962 if (addr < end)
944 if (flags & EIO_MT_MODIFY) /* modify */ 963 if (flags & EIO_MT_MODIFY) /* modify */
945 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));
946 else 965 else
947 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));
948 } 967 }
949 968
950 return 0; 969 return 0;
951} 970}
952 971
… …
1018 if (fd >= 0) 1037 if (fd >= 0)
1019 { 1038 {
1020 sprintf (tmp1, "/proc/self/fd/%d", fd); 1039 sprintf (tmp1, "/proc/self/fd/%d", fd);
1021 req->result = readlink (tmp1, res, EIO_PATH_MAX); 1040 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 */ 1041 /* here we should probably stat the open file and the disk file, to make sure they still match */
1023 close (fd); 1042 eio__close (fd);
1024 1043
1025 if (req->result > 0) 1044 if (req->result > 0)
1026 goto done; 1045 goto done;
1027 } 1046 }
1028 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)
… …
1386 return; 1405 return;
1387 1406
1388 dirp = fdopendir (fd); 1407 dirp = fdopendir (fd);
1389 1408
1390 if (!dirp) 1409 if (!dirp)
1391 close (fd); 1410 silent_close (fd);
1392 } 1411 }
1393 else 1412 else
1394 dirp = opendir (req->ptr1); 1413 dirp = opendir (req->ptr1);
1395 #else 1414 #else
1396 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1)); 1415 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
… …
1675eio_wd_close_sync (eio_wd wd) 1694eio_wd_close_sync (eio_wd wd)
1676{ 1695{
1677 if (wd != EIO_INVALID_WD && wd != EIO_CWD) 1696 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
1678 { 1697 {
1679 #if HAVE_AT 1698 #if HAVE_AT
1680 close (wd->fd); 1699 eio__close (wd->fd);
1681 #endif 1700 #endif
1682 free (wd); 1701 free (wd);
1683 } 1702 }
1684} 1703}
1685 1704
… …
1708 1727
1709 if (fd < 0) 1728 if (fd < 0)
1710 return fd; 1729 return fd;
1711 1730
1712 res = ftruncate (fd, length); 1731 res = ftruncate (fd, length);
1713 close (fd); 1732 silent_close (fd);
1714 return res; 1733 return res;
1715} 1734}
1716 1735
1717static int 1736static int
1718eio__statvfsat (int dirfd, const char *path, struct statvfs *buf) 1737eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
… …
1722 1741
1723 if (fd < 0) 1742 if (fd < 0)
1724 return fd; 1743 return fd;
1725 1744
1726 res = fstatvfs (fd, buf); 1745 res = fstatvfs (fd, buf);
1727 close (fd); 1746 silent_close (fd);
1728 return res; 1747 return res;
1729
1730} 1748}
1731 1749
1732#endif 1750#endif
1733 1751
1734/*****************************************************************************/ 1752/*****************************************************************************/
… …
1742 req->ptr2 = malloc (len); \ 1760 req->ptr2 = malloc (len); \
1743 if (!req->ptr2) \ 1761 if (!req->ptr2) \
1744 { \ 1762 { \
1745 errno = ENOMEM; \ 1763 errno = ENOMEM; \
1746 req->result = -1; \ 1764 req->result = -1; \
1747 break; \ 1765 goto alloc_fail; \
1748 } \ 1766 } \
1749 } 1767 }
1750 1768
1751/*****************************************************************************/ 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}
1752 1798
1753int ecb_cold 1799int ecb_cold
1754eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1800eio_init (void (*want_poll)(void), void (*done_poll)(void))
1755{ 1801{
1756 eio_want_poll_cb = want_poll; 1802 eio_want_poll_cb = want_poll;
… …
1854 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;
1855 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;
1856 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;
1857 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;
1858 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;
1859 1906
1860 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break; 1907 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 */ 1908 case EIO_RMDIR: /* complications arise because "." cannot be removed, so we might have to expand */
1862 req->result = req->wd && SINGLEDOT (req->ptr1) 1909 req->result = req->wd && SINGLEDOT (req->ptr1)
1863 ? rmdir (req->wd->str) 1910 ? rmdir (req->wd->str)
… …
1917 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break; 1964 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
1918 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;
1919 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;
1920 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break; 1967 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; 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;
1922 1970
1923 case EIO_UNLINK: req->result = unlink (path ); break; 1971 case EIO_UNLINK: req->result = unlink (path ); break;
1924 case EIO_RMDIR: req->result = rmdir (path ); break; 1972 case EIO_RMDIR: req->result = rmdir (path ); break;
1925 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;
1926 case EIO_RENAME: req->result = req->int2 ? EIO_ENOSYS () : rename (path, req->ptr2); break; 1974 case EIO_RENAME: req->result = req->int2 ? EIO_ENOSYS () : rename (path, req->ptr2); break;
… …
1979 2027
1980 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;
1981 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;
1982 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break; 2030 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1983 2031
1984 case EIO_CLOSE: req->result = close (req->int1); break; 2032 case EIO_CLOSE: req->result = eio__close (req->int1); break;
1985 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 2033 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
1986 case EIO_SYNC: req->result = 0; sync (); break; 2034 case EIO_SYNC: req->result = 0; sync (); break;
1987 case EIO_FSYNC: req->result = fsync (req->int1); break; 2035 case EIO_FSYNC: req->result = fsync (req->int1); break;
1988 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2036 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1989 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break; 2037 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
… …
2027 default: 2075 default:
2028 req->result = EIO_ENOSYS (); 2076 req->result = EIO_ENOSYS ();
2029 break; 2077 break;
2030 } 2078 }
2031 2079
2080alloc_fail:
2032 req->errorno = errno; 2081 req->errorno = errno;
2033} 2082}
2034 2083
2035#ifndef EIO_NO_WRAPPERS 2084#ifndef EIO_NO_WRAPPERS
2036 2085
… …
2289eio_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)
2290{ 2339{
2291 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 2340 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
2292} 2341}
2293 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
2294eio_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)
2295{ 2349{
2296 REQ (EIO_CUSTOM); req->feed = execute; SEND; 2350 REQ (EIO_CUSTOM); req->feed = execute; SEND;
2297} 2351}
2298 2352

Diff Legend

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