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

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.106 by root, Mon Sep 26 20:19:08 2011 UTC vs.
Revision 1.116 by root, Tue Mar 27 19:27:35 2012 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
… …
393#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 409#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
394#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) 410#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
395 411
396/* worker threads management */ 412/* worker threads management */
397 413
398static void ecb_cold 414static void
399etp_worker_clear (etp_worker *wrk) 415etp_worker_clear (etp_worker *wrk)
400{ 416{
401} 417}
402 418
403static void ecb_cold 419static void ecb_cold
… …
1086 todo -= len; 1102 todo -= len;
1087 } 1103 }
1088 1104
1089 FUBd; 1105 FUBd;
1090 1106
1091 errno = 0; 1107 /* linux's readahead basically only fails for EBADF or EINVAL (not mmappable) */
1108 /* but not for e.g. EIO or eof, so we also never fail */
1092 return count; 1109 return 0;
1093} 1110}
1094 1111
1095#endif 1112#endif
1096 1113
1097/* sendfile always needs emulation */ 1114/* sendfile always needs emulation */
… …
1366} 1383}
1367 1384
1368/*****************************************************************************/ 1385/*****************************************************************************/
1369/* requests implemented outside eio_execute, because they are so large */ 1386/* requests implemented outside eio_execute, because they are so large */
1370 1387
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 */ 1388/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
1387static int 1389static int
1388eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path) 1390eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
1389{ 1391{
1390 const char *rel = path; 1392 const char *rel = path;
… …
1394 int symlinks = SYMLOOP_MAX; 1396 int symlinks = SYMLOOP_MAX;
1395#else 1397#else
1396 int symlinks = 32; 1398 int symlinks = 32;
1397#endif 1399#endif
1398 1400
1399 /*D*/ /*TODO: wd ignored */
1400
1401 errno = EINVAL; 1401 errno = EINVAL;
1402 if (!rel) 1402 if (!rel)
1403 return -1; 1403 return -1;
1404 1404
1405 errno = ENOENT; 1405 errno = ENOENT;
… …
1433#endif 1433#endif
1434#endif 1434#endif
1435 1435
1436 if (*rel != '/') 1436 if (*rel != '/')
1437 { 1437 {
1438 if (!eio__getwd (tmpbuf, wd)) 1438 int len;
1439
1440 errno = ENOENT;
1441 if (wd == EIO_INVALID_WD)
1439 return -1; 1442 return -1;
1443
1444 if (wd == EIO_CWD)
1445 {
1446 if (!getcwd (res, PATH_MAX))
1447 return -1;
1448
1449 len = strlen (res);
1450 }
1451 else
1452 memcpy (res, wd->str, len = wd->len);
1440 1453
1441 if (res [1]) /* only use if not / */ 1454 if (res [1]) /* only use if not / */
1442 res += strlen (res); 1455 res += len;
1443 } 1456 }
1444 1457
1445 while (*rel) 1458 while (*rel)
1446 { 1459 {
1447 eio_ssize_t len, linklen; 1460 eio_ssize_t len, linklen;
… …
1475 } 1488 }
1476 } 1489 }
1477 1490
1478 errno = ENAMETOOLONG; 1491 errno = ENAMETOOLONG;
1479 if (res + 1 + len + 1 >= tmp1) 1492 if (res + 1 + len + 1 >= tmp1)
1480 return; 1493 return -1;
1481 1494
1482 /* copy one component */ 1495 /* copy one component */
1483 *res = '/'; 1496 *res = '/';
1484 memcpy (res + 1, beg, len); 1497 memcpy (res + 1, beg, len);
1485 1498
… …
1694 eio_dent_insertion_sort (dents, size); 1707 eio_dent_insertion_sort (dents, size);
1695} 1708}
1696 1709
1697/* read a full directory */ 1710/* read a full directory */
1698static void 1711static void
1699eio__scandir (eio_req *req) 1712eio__scandir (eio_req *req, etp_worker *self)
1700{ 1713{
1701 char *name, *names; 1714 char *name, *names;
1702 int namesalloc = 4096 - sizeof (void *) * 4; 1715 int namesalloc = 4096 - sizeof (void *) * 4;
1703 int namesoffs = 0; 1716 int namesoffs = 0;
1704 int flags = req->int1; 1717 int flags = req->int1;
… …
1722#ifdef _WIN32 1735#ifdef _WIN32
1723 { 1736 {
1724 int len = strlen ((const char *)req->ptr1); 1737 int len = strlen ((const char *)req->ptr1);
1725 char *path = malloc (MAX_PATH); 1738 char *path = malloc (MAX_PATH);
1726 const char *fmt; 1739 const char *fmt;
1740 const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1727 1741
1728 if (!len) 1742 if (!len)
1729 fmt = "./*"; 1743 fmt = "./*";
1730 else if (((const char *)req->ptr1)[len - 1] == '/' || ((const char *)req->ptr1)[len - 1] == '\\') 1744 else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1731 fmt = "%s*"; 1745 fmt = "%s*";
1732 else 1746 else
1733 fmt = "%s/*"; 1747 fmt = "%s/*";
1734 1748
1735 _snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1); 1749 _snprintf (path, MAX_PATH, fmt, reqpath);
1736 dirp = FindFirstFile (path, &entp); 1750 dirp = FindFirstFile (path, &entp);
1737 free (path); 1751 free (path);
1738 1752
1739 if (dirp == INVALID_HANDLE_VALUE) 1753 if (dirp == INVALID_HANDLE_VALUE)
1740 { 1754 {
… …
1762 1776
1763 return; 1777 return;
1764 } 1778 }
1765 } 1779 }
1766#else 1780#else
1781 #if HAVE_AT
1782 if (req->wd)
1783 {
1784 int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1785
1786 if (fd < 0)
1787 return;
1788
1789 dirp = fdopendir (fd);
1790
1791 if (!dirp)
1792 close (fd);
1793 }
1794 else
1767 dirp = opendir (req->ptr1); 1795 dirp = opendir (req->ptr1);
1796 #else
1797 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
1798 #endif
1768 1799
1769 if (!dirp) 1800 if (!dirp)
1770 return; 1801 return;
1771#endif 1802#endif
1772 1803
… …
1936 { 1967 {
1937 if (ent->type == EIO_DT_UNKNOWN) 1968 if (ent->type == EIO_DT_UNKNOWN)
1938 { 1969 {
1939 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */ 1970 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1940 ent->score = 1; 1971 ent->score = 1;
1941 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */ 1972 else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1942 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */ 1973 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1943 } 1974 }
1944 else if (ent->type == EIO_DT_DIR) 1975 else if (ent->type == EIO_DT_DIR)
1945 ent->score = 0; 1976 ent->score = 0;
1946 } 1977 }
… …
1966 } 1997 }
1967} 1998}
1968 1999
1969/*****************************************************************************/ 2000/*****************************************************************************/
1970/* working directory stuff */ 2001/* working directory stuff */
2002/* various deficiencies in the posix 2008 api force us to */
2003/* keep the absolute path in string form at all times */
2004/* fuck yeah. */
2005
2006#if !HAVE_AT
2007
2008/* a bit like realpath, but usually faster because it doesn'T have to return */
2009/* an absolute or canonical path */
2010static const char *
2011wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2012{
2013 if (!wd || *path == '/')
2014 return path;
2015
2016 if (path [0] == '.' && !path [1])
2017 return wd->str;
2018
2019 {
2020 int l1 = wd->len;
2021 int l2 = strlen (path);
2022
2023 char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2);
2024
2025 memcpy (res, wd->str, l1);
2026 res [l1] = '/';
2027 memcpy (res + l1 + 1, path, l2 + 1);
2028
2029 return res;
2030 }
2031}
2032
2033#endif
2034
2035static eio_wd
2036eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2037{
2038 int fd;
2039 eio_wd res;
2040 int len = eio__realpath (tmpbuf, wd, path);
2041
2042 if (len < 0)
2043 return EIO_INVALID_WD;
1971 2044
1972#if HAVE_AT 2045#if HAVE_AT
2046 fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1973 2047
1974#define WD2FD(wd) ((wd) ? ((int)(long)(wd)) - 1 : AT_FDCWD) 2048 if (fd < 0)
1975 2049 return EIO_INVALID_WD;
1976#ifndef O_SEARCH
1977# define O_SEARCH O_RDONLY
1978#endif 2050#endif
2051
2052 res = malloc (sizeof (*res) + len); /* one extra 0-byte */
2053
2054#if HAVE_AT
2055 res->fd = fd;
2056#endif
2057
2058 res->len = len;
2059 memcpy (res->str, tmpbuf->ptr, len);
2060 res->str [len] = 0;
2061
2062 return res;
2063}
1979 2064
1980eio_wd 2065eio_wd
1981eio_wd_open_sync (eio_wd wd, const char *path) 2066eio_wd_open_sync (eio_wd wd, const char *path)
1982{ 2067{
1983 int fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY); 2068 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); 2069 wd = eio__wd_open_sync (&tmpbuf, wd, path);
2070 free (tmpbuf.ptr);
2071
2072 return wd;
1992} 2073}
1993 2074
1994void 2075void
1995eio_wd_close_sync (eio_wd wd) 2076eio_wd_close_sync (eio_wd wd)
1996{ 2077{
1997 int fd = WD2FD (wd); 2078 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
1998 2079 {
1999 if (fd >= 0) 2080 #if HAVE_AT
2000 close (fd); 2081 close (wd->fd);
2082 #endif
2083 free (wd);
2084 }
2001} 2085}
2086
2087#if HAVE_AT
2088
2089/* they forgot these */
2002 2090
2003static int 2091static int
2004eio__truncateat (int dirfd, const char *path, off_t length) 2092eio__truncateat (int dirfd, const char *path, off_t length)
2005{ 2093{
2006 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC); 2094 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
… …
2025 2113
2026 res = fstatvfs (fd, buf); 2114 res = fstatvfs (fd, buf);
2027 close (fd); 2115 close (fd);
2028 return res; 2116 return res;
2029 2117
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} 2118}
2098 2119
2099#endif 2120#endif
2100 2121
2101/*****************************************************************************/ 2122/*****************************************************************************/
… …
2113 req->result = -1; \ 2134 req->result = -1; \
2114 break; \ 2135 break; \
2115 } \ 2136 } \
2116 } 2137 }
2117 2138
2139static void ecb_noinline ecb_cold
2140etp_proc_init (void)
2141{
2142#if HAVE_PRCTL_SET_NAME
2143 /* provide a more sensible "thread name" */
2144 char name[16 + 1];
2145 const int namelen = sizeof (name) - 1;
2146 int len;
2147
2148 prctl (PR_GET_NAME, (unsigned long)name, 0, 0, 0);
2149 name [namelen] = 0;
2150 len = strlen (name);
2151 strcpy (name + (len <= namelen - 4 ? len : namelen - 4), "/eio");
2152 prctl (PR_SET_NAME, (unsigned long)name, 0, 0, 0);
2153#endif
2154}
2155
2118X_THREAD_PROC (etp_proc) 2156X_THREAD_PROC (etp_proc)
2119{ 2157{
2120 ETP_REQ *req; 2158 ETP_REQ *req;
2121 struct timespec ts; 2159 struct timespec ts;
2122 etp_worker *self = (etp_worker *)thr_arg; 2160 etp_worker *self = (etp_worker *)thr_arg;
2123 2161
2124#if HAVE_PRCTL_SET_NAME 2162 etp_proc_init ();
2125 prctl (PR_SET_NAME, (unsigned long)"eio_thread", 0, 0, 0);
2126#endif
2127 2163
2128 /* try to distribute timeouts somewhat evenly */ 2164 /* try to distribute timeouts somewhat evenly */
2129 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 2165 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
2130 2166
2131 for (;;) 2167 for (;;)
… …
2304 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break; 2340 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
2305 2341
2306 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break; 2342 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
2307 case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break; 2343 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; 2344 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; 2345 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; 2346 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; 2347 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; 2348 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); 2349 case EIO_READLINK: ALLOC (PATH_MAX);
2314 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break; 2350 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
2315 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 2351 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
… …
2415 case EIO_MTOUCH: req->result = eio__mtouch (req); break; 2451 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2416 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break; 2452 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2417 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 2453 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; 2454 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2419 2455
2420 case EIO_READDIR: eio__scandir (req); break; 2456 case EIO_READDIR: eio__scandir (req, self); break;
2421 2457
2422 case EIO_BUSY: 2458 case EIO_BUSY:
2423#ifdef _WIN32 2459#ifdef _WIN32
2424 Sleep (req->nv1 * 1e3); 2460 Sleep (req->nv1 * 1e3);
2425#else 2461#else
… …
2453 2489
2454 req->errorno = errno; 2490 req->errorno = errno;
2455} 2491}
2456 2492
2457#ifndef EIO_NO_WRAPPERS 2493#ifndef EIO_NO_WRAPPERS
2494
2495eio_req *eio_wd_open (const char *path, int pri, eio_cb cb, void *data)
2496{
2497 REQ (EIO_WD_OPEN); PATH; SEND;
2498}
2499
2500eio_req *eio_wd_close (eio_wd wd, int pri, eio_cb cb, void *data)
2501{
2502 REQ (EIO_WD_CLOSE); req->wd = wd; SEND;
2503}
2458 2504
2459eio_req *eio_nop (int pri, eio_cb cb, void *data) 2505eio_req *eio_nop (int pri, eio_cb cb, void *data)
2460{ 2506{
2461 REQ (EIO_NOP); SEND; 2507 REQ (EIO_NOP); SEND;
2462} 2508}

Diff Legend

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