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

Comparing libeio/eio.c (file contents):
Revision 1.106 by root, Mon Sep 26 20:19:08 2011 UTC vs.
Revision 1.107 by root, Tue Sep 27 00:41:52 2011 UTC

… …
58#include <sys/stat.h> 58#include <sys/stat.h>
59#include <limits.h> 59#include <limits.h>
60#include <fcntl.h> 60#include <fcntl.h>
61#include <assert.h> 61#include <assert.h>
62 62
63#if _POSIX_VERSION >= 200809L
64# define HAVE_AT 1
65#else
66# define HAVE_AT 0
67#endif
68
69/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */ 63/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */
70/* intptr_t only comes from stdint.h, says idiot openbsd coder */ 64/* intptr_t only comes from stdint.h, says idiot openbsd coder */
71#if HAVE_STDINT_H 65#if HAVE_STDINT_H
72# include <stdint.h> 66# include <stdint.h>
73#endif 67#endif
… …
318 } 312 }
319 313
320 return buf->ptr; 314 return buf->ptr;
321} 315}
322 316
317struct tmpbuf;
318
319#if _POSIX_VERSION >= 200809L
320 #define HAVE_AT 1
321 # define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD)
322 #ifndef O_SEARCH
323 #define O_SEARCH O_RDONLY
324 #endif
325#else
326 #define HAVE_AT 0
327 static const char *wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path);
328#endif
329
330struct eio_pwd
331{
332#if HAVE_AT
333 int fd;
334#endif
335 int len;
336 char str[1]; /* actually, a 0-terminated canonical path */
337};
338
323/*****************************************************************************/ 339/*****************************************************************************/
324 340
325#define ETP_PRI_MIN EIO_PRI_MIN 341#define ETP_PRI_MIN EIO_PRI_MIN
326#define ETP_PRI_MAX EIO_PRI_MAX 342#define ETP_PRI_MAX EIO_PRI_MAX
327 343
… …
1366} 1382}
1367 1383
1368/*****************************************************************************/ 1384/*****************************************************************************/
1369/* requests implemented outside eio_execute, because they are so large */ 1385/* requests implemented outside eio_execute, because they are so large */
1370 1386
1371/* copies some absolute path to tmpbuf */
1372static char *
1373eio__getwd (struct tmpbuf *tmpbuf, eio_wd wd)
1374{
1375 if (wd == EIO_CWD)
1376 return getcwd (tmpbuf->ptr, PATH_MAX);
1377
1378#if HAVE_AT
1379 abort (); /*TODO*/
1380#else
1381 strcpy (tmpbuf->ptr, wd);
1382#endif
1383 return tmpbuf->ptr;
1384}
1385
1386/* result will always end up in tmpbuf, there is always space for adding a 0-byte */ 1387/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
1387static int 1388static int
1388eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path) 1389eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
1389{ 1390{
1390 const char *rel = path; 1391 const char *rel = path;
… …
1394 int symlinks = SYMLOOP_MAX; 1395 int symlinks = SYMLOOP_MAX;
1395#else 1396#else
1396 int symlinks = 32; 1397 int symlinks = 32;
1397#endif 1398#endif
1398 1399
1399 /*D*/ /*TODO: wd ignored */
1400
1401 errno = EINVAL; 1400 errno = EINVAL;
1402 if (!rel) 1401 if (!rel)
1403 return -1; 1402 return -1;
1404 1403
1405 errno = ENOENT; 1404 errno = ENOENT;
… …
1433#endif 1432#endif
1434#endif 1433#endif
1435 1434
1436 if (*rel != '/') 1435 if (*rel != '/')
1437 { 1436 {
1438 if (!eio__getwd (tmpbuf, wd)) 1437 int len;
1438
1439 errno = ENOENT;
1440 if (wd == EIO_INVALID_WD)
1439 return -1; 1441 return -1;
1442
1443 if (wd == EIO_CWD)
1444 {
1445 if (!getcwd (res, PATH_MAX))
1446 return -1;
1447
1448 len = strlen (res);
1449 }
1450 else
1451 memcpy (res, wd->str, len = wd->len);
1440 1452
1441 if (res [1]) /* only use if not / */ 1453 if (res [1]) /* only use if not / */
1442 res += strlen (res); 1454 res += len;
1443 } 1455 }
1444 1456
1445 while (*rel) 1457 while (*rel)
1446 { 1458 {
1447 eio_ssize_t len, linklen; 1459 eio_ssize_t len, linklen;
… …
1694 eio_dent_insertion_sort (dents, size); 1706 eio_dent_insertion_sort (dents, size);
1695} 1707}
1696 1708
1697/* read a full directory */ 1709/* read a full directory */
1698static void 1710static void
1699eio__scandir (eio_req *req) 1711eio__scandir (eio_req *req, etp_worker *self)
1700{ 1712{
1701 char *name, *names; 1713 char *name, *names;
1702 int namesalloc = 4096 - sizeof (void *) * 4; 1714 int namesalloc = 4096 - sizeof (void *) * 4;
1703 int namesoffs = 0; 1715 int namesoffs = 0;
1704 int flags = req->int1; 1716 int flags = req->int1;
… …
1722#ifdef _WIN32 1734#ifdef _WIN32
1723 { 1735 {
1724 int len = strlen ((const char *)req->ptr1); 1736 int len = strlen ((const char *)req->ptr1);
1725 char *path = malloc (MAX_PATH); 1737 char *path = malloc (MAX_PATH);
1726 const char *fmt; 1738 const char *fmt;
1739 const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1727 1740
1728 if (!len) 1741 if (!len)
1729 fmt = "./*"; 1742 fmt = "./*";
1730 else if (((const char *)req->ptr1)[len - 1] == '/' || ((const char *)req->ptr1)[len - 1] == '\\') 1743 else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1731 fmt = "%s*"; 1744 fmt = "%s*";
1732 else 1745 else
1733 fmt = "%s/*"; 1746 fmt = "%s/*";
1734 1747
1735 _snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1); 1748 _snprintf (path, MAX_PATH, fmt, reqpath);
1736 dirp = FindFirstFile (path, &entp); 1749 dirp = FindFirstFile (path, &entp);
1737 free (path); 1750 free (path);
1738 1751
1739 if (dirp == INVALID_HANDLE_VALUE) 1752 if (dirp == INVALID_HANDLE_VALUE)
1740 { 1753 {
… …
1762 1775
1763 return; 1776 return;
1764 } 1777 }
1765 } 1778 }
1766#else 1779#else
1780 #if HAVE_AT
1781 if (req->wd)
1782 {
1783 int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1784
1785 if (fd < 0)
1786 return;
1787
1788 dirp = fdopendir (fd);
1789 }
1790 else
1767 dirp = opendir (req->ptr1); 1791 dirp = opendir (req->ptr1);
1792 #else
1793 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
1794 #endif
1768 1795
1769 if (!dirp) 1796 if (!dirp)
1770 return; 1797 return;
1771#endif 1798#endif
1772 1799
… …
1966 } 1993 }
1967} 1994}
1968 1995
1969/*****************************************************************************/ 1996/*****************************************************************************/
1970/* working directory stuff */ 1997/* working directory stuff */
1998/* various deficiencies in the posix 2008 api force us to */
1999/* keep the absolute path in string form at all times */
2000/* fuck yeah. */
2001
2002#if !HAVE_AT
2003
2004/* a bit like realpath, but usually faster because it doesn'T have to return */
2005/* an absolute or canonical path */
2006static const char *
2007wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2008{
2009 if (!wd || *path == '/')
2010 return path;
2011
2012 if (path [0] == '.' && !path [1])
2013 return wd->str;
2014
2015 {
2016 int l1 = wd->len;
2017 int l2 = strlen (path);
2018
2019 char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2);
2020
2021 memcpy (res, wd->str, l1);
2022 res [l1] = '/';
2023 memcpy (res + l1 + 1, path, l2 + 1);
2024
2025 return res;
2026 }
2027}
2028
2029#endif
2030
2031static eio_wd
2032eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2033{
2034 int fd;
2035 eio_wd res;
2036 int len = eio__realpath (tmpbuf, wd, path);
2037
2038 if (len < 0)
2039 return EIO_INVALID_WD;
1971 2040
1972#if HAVE_AT 2041#if HAVE_AT
2042 fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1973 2043
1974#define WD2FD(wd) ((wd) ? ((int)(long)(wd)) - 1 : AT_FDCWD) 2044 if (fd < 0)
1975 2045 return EIO_INVALID_WD;
1976#ifndef O_SEARCH
1977# define O_SEARCH O_RDONLY
1978#endif 2046#endif
2047
2048 res = malloc (sizeof (*res) + len); /* one extra 0-byte */
2049
2050#if HAVE_AT
2051 res->fd = fd;
2052#endif
2053
2054 res->len = len;
2055 memcpy (res->str, tmpbuf->ptr, len);
2056 res->str [len] = 0;
2057
2058 return res;
2059}
1979 2060
1980eio_wd 2061eio_wd
1981eio_wd_open_sync (eio_wd wd, const char *path) 2062eio_wd_open_sync (eio_wd wd, const char *path)
1982{ 2063{
1983 int fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY); 2064 struct tmpbuf tmpbuf = { 0 };
1984
1985 return fd >= 0 ? (eio_wd)(long)(fd + 1) : EIO_INVALID_WD;
1986}
1987
1988static eio_wd
1989eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
1990{
1991 return eio_wd_open_sync (wd, path); 2065 wd = eio__wd_open_sync (&tmpbuf, wd, path);
2066 free (tmpbuf.ptr);
2067
2068 return wd;
1992} 2069}
1993 2070
1994void 2071void
1995eio_wd_close_sync (eio_wd wd) 2072eio_wd_close_sync (eio_wd wd)
1996{ 2073{
1997 int fd = WD2FD (wd); 2074 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
1998 2075 {
1999 if (fd >= 0) 2076 #if HAVE_AT
2000 close (fd); 2077 close (wd->fd);
2078 #endif
2079 free (wd);
2080 }
2001} 2081}
2082
2083#if HAVE_AT
2084
2085/* they forgot these */
2002 2086
2003static int 2087static int
2004eio__truncateat (int dirfd, const char *path, off_t length) 2088eio__truncateat (int dirfd, const char *path, off_t length)
2005{ 2089{
2006 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC); 2090 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
… …
2025 2109
2026 res = fstatvfs (fd, buf); 2110 res = fstatvfs (fd, buf);
2027 close (fd); 2111 close (fd);
2028 return res; 2112 return res;
2029 2113
2030}
2031
2032#else
2033
2034/* on legacy systems, we represent the working directories simply by their path strings */
2035
2036static const char *
2037wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2038{
2039 if (!wd || *path == '/')
2040 return path;
2041
2042 {
2043 int l1 = strlen ((const char *)wd);
2044 int l2 = strlen (path);
2045
2046 char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2);
2047
2048 memcpy (res, wd, l1);
2049 res [l1] = '/';
2050 memcpy (res + l1 + 1, path, l2 + 1);
2051
2052 return res;
2053 }
2054}
2055
2056static eio_wd
2057eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2058{
2059 if (*path == '/') /* absolute paths ignore wd */
2060 path = strdup (path);
2061 else if (path [0] == '.' && !path [1]) /* special case '.', as it is common */
2062 return wd;
2063 else
2064 {
2065 int len = eio__realpath (tmpbuf, wd, path);
2066
2067 path = EIO_INVALID_WD;
2068
2069 if (len >= 0)
2070 {
2071 ((char *)tmpbuf->ptr)[len] = 0;
2072 path = strdup (tmpbuf->ptr);
2073 }
2074 }
2075
2076 if (!path)
2077 path = EIO_INVALID_WD;
2078
2079 return (eio_wd)path;
2080}
2081
2082eio_wd
2083eio_wd_open_sync (eio_wd wd, const char *path)
2084{
2085 struct tmpbuf tmpbuf = { 0 };
2086 wd = eio__wd_open_sync (&tmpbuf, wd, path);
2087 free (tmpbuf.ptr);
2088
2089 return wd;
2090}
2091
2092void
2093eio_wd_close_sync (eio_wd wd)
2094{
2095 if (wd != EIO_INVALID_WD)
2096 free (wd);
2097} 2114}
2098 2115
2099#endif 2116#endif
2100 2117
2101/*****************************************************************************/ 2118/*****************************************************************************/
… …
2304 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break; 2321 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
2305 2322
2306 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break; 2323 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
2307 case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break; 2324 case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
2308 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break; 2325 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
2309 case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD (req->int3), req->ptr2); break; 2326 case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
2310 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD (req->int3), req->ptr2, 0); break; 2327 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
2311 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break; 2328 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
2312 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break; 2329 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2313 case EIO_READLINK: ALLOC (PATH_MAX); 2330 case EIO_READLINK: ALLOC (PATH_MAX);
2314 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break; 2331 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
2315 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 2332 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
… …
2415 case EIO_MTOUCH: req->result = eio__mtouch (req); break; 2432 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2416 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break; 2433 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2417 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 2434 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2418 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break; 2435 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2419 2436
2420 case EIO_READDIR: eio__scandir (req); break; 2437 case EIO_READDIR: eio__scandir (req, self); break;
2421 2438
2422 case EIO_BUSY: 2439 case EIO_BUSY:
2423#ifdef _WIN32 2440#ifdef _WIN32
2424 Sleep (req->nv1 * 1e3); 2441 Sleep (req->nv1 * 1e3);
2425#else 2442#else

Diff Legend

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