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

Comparing libeio/eio.c (file contents):
Revision 1.101 by root, Wed Aug 3 15:25:38 2011 UTC vs.
Revision 1.107 by root, Tue Sep 27 00:41:52 2011 UTC

43 43
44#include "eio.h" 44#include "eio.h"
45#include "ecb.h" 45#include "ecb.h"
46 46
47#ifdef EIO_STACKSIZE 47#ifdef EIO_STACKSIZE
48# define XTHREAD_STACKSIZE EIO_STACKSIZE 48# define X_STACKSIZE EIO_STACKSIZE
49#endif 49#endif
50#include "xthread.h" 50#include "xthread.h"
51 51
52#include <errno.h> 52#include <errno.h>
53#include <stddef.h> 53#include <stddef.h>
292#define FUBd \ 292#define FUBd \
293 free (eio_buf) 293 free (eio_buf)
294 294
295#define EIO_TICKS ((1000000 + 1023) >> 10) 295#define EIO_TICKS ((1000000 + 1023) >> 10)
296 296
297/*****************************************************************************/
298
299struct tmpbuf
300{
301 void *ptr;
302 int len;
303};
304
305static void *
306tmpbuf_get (struct tmpbuf *buf, int len)
307{
308 if (buf->len < len)
309 {
310 free (buf->ptr);
311 buf->ptr = malloc (buf->len = len);
312 }
313
314 return buf->ptr;
315}
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
339/*****************************************************************************/
340
297#define ETP_PRI_MIN EIO_PRI_MIN 341#define ETP_PRI_MIN EIO_PRI_MIN
298#define ETP_PRI_MAX EIO_PRI_MAX 342#define ETP_PRI_MAX EIO_PRI_MAX
299 343
300struct etp_worker; 344struct etp_worker;
301 345
346static xmutex_t preadwritelock; 390static xmutex_t preadwritelock;
347#endif 391#endif
348 392
349typedef struct etp_worker 393typedef struct etp_worker
350{ 394{
395 struct tmpbuf tmpbuf;
396
351 /* locked by wrklock */ 397 /* locked by wrklock */
352 struct etp_worker *prev, *next; 398 struct etp_worker *prev, *next;
353 399
354 xthread_t tid; 400 xthread_t tid;
355 401
356 /* locked by reslock, reqlock or wrklock */
357 ETP_REQ *req; /* currently processed request */
358
359#ifdef ETP_WORKER_COMMON 402#ifdef ETP_WORKER_COMMON
360 ETP_WORKER_COMMON 403 ETP_WORKER_COMMON
361#endif 404#endif
362} etp_worker; 405} etp_worker;
363 406
374} 417}
375 418
376static void ecb_cold 419static void ecb_cold
377etp_worker_free (etp_worker *wrk) 420etp_worker_free (etp_worker *wrk)
378{ 421{
422 free (wrk->tmpbuf.ptr);
423
379 wrk->next->prev = wrk->prev; 424 wrk->next->prev = wrk->prev;
380 wrk->prev->next = wrk->next; 425 wrk->prev->next = wrk->next;
381 426
382 free (wrk); 427 free (wrk);
383} 428}
561} 606}
562 607
563static void ecb_cold 608static void ecb_cold
564etp_end_thread (void) 609etp_end_thread (void)
565{ 610{
566 eio_req *req = calloc (1, sizeof (eio_req)); 611 eio_req *req = calloc (1, sizeof (eio_req)); /* will be freed by worker */
567 612
568 req->type = -1; 613 req->type = -1;
569 req->pri = ETP_PRI_MAX - ETP_PRI_MIN; 614 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
570 615
571 X_LOCK (reqlock); 616 X_LOCK (reqlock);
1337} 1382}
1338 1383
1339/*****************************************************************************/ 1384/*****************************************************************************/
1340/* requests implemented outside eio_execute, because they are so large */ 1385/* requests implemented outside eio_execute, because they are so large */
1341 1386
1387/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
1342static void 1388static int
1343eio__realpath (eio_req *req, etp_worker *self) 1389eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
1344{ 1390{
1345 char *rel = req->ptr1; 1391 const char *rel = path;
1346 char *res; 1392 char *res;
1347 char *tmp1, *tmp2; 1393 char *tmp1, *tmp2;
1348#if SYMLOOP_MAX > 32 1394#if SYMLOOP_MAX > 32
1349 int symlinks = SYMLOOP_MAX; 1395 int symlinks = SYMLOOP_MAX;
1350#else 1396#else
1351 int symlinks = 32; 1397 int symlinks = 32;
1352#endif 1398#endif
1353 1399
1354 req->result = -1;
1355
1356 errno = EINVAL; 1400 errno = EINVAL;
1357 if (!rel) 1401 if (!rel)
1358 return; 1402 return -1;
1359 1403
1360 errno = ENOENT; 1404 errno = ENOENT;
1361 if (!*rel) 1405 if (!*rel)
1362 return; 1406 return -1;
1363 1407
1364 if (!req->ptr2) 1408 res = tmpbuf_get (tmpbuf, PATH_MAX * 3);
1365 {
1366 X_LOCK (wrklock);
1367 req->flags |= EIO_FLAG_PTR2_FREE;
1368 X_UNLOCK (wrklock);
1369 req->ptr2 = malloc (PATH_MAX * 3);
1370
1371 errno = ENOMEM;
1372 if (!req->ptr2)
1373 return;
1374 }
1375
1376 res = req->ptr2;
1377 tmp1 = res + PATH_MAX; 1409 tmp1 = res + PATH_MAX;
1378 tmp2 = tmp1 + PATH_MAX; 1410 tmp2 = tmp1 + PATH_MAX;
1379 1411
1380#if 0 /* disabled, the musl way to do things is just too racy */ 1412#if 0 /* disabled, the musl way to do things is just too racy */
1381#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1413#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1400#endif 1432#endif
1401#endif 1433#endif
1402 1434
1403 if (*rel != '/') 1435 if (*rel != '/')
1404 { 1436 {
1437 int len;
1438
1439 errno = ENOENT;
1440 if (wd == EIO_INVALID_WD)
1441 return -1;
1442
1443 if (wd == EIO_CWD)
1444 {
1405 if (!getcwd (res, PATH_MAX)) 1445 if (!getcwd (res, PATH_MAX))
1406 return; 1446 return -1;
1447
1448 len = strlen (res);
1449 }
1450 else
1451 memcpy (res, wd->str, len = wd->len);
1407 1452
1408 if (res [1]) /* only use if not / */ 1453 if (res [1]) /* only use if not / */
1409 res += strlen (res); 1454 res += len;
1410 } 1455 }
1411 1456
1412 while (*rel) 1457 while (*rel)
1413 { 1458 {
1414 eio_ssize_t len, linklen; 1459 eio_ssize_t len, linklen;
1415 char *beg = rel; 1460 const char *beg = rel;
1416 1461
1417 while (*rel && *rel != '/') 1462 while (*rel && *rel != '/')
1418 ++rel; 1463 ++rel;
1419 1464
1420 len = rel - beg; 1465 len = rel - beg;
1432 1477
1433 if (beg [1] == '.' && len == 2) 1478 if (beg [1] == '.' && len == 2)
1434 { 1479 {
1435 /* .. - back up one component, if possible */ 1480 /* .. - back up one component, if possible */
1436 1481
1437 while (res != req->ptr2) 1482 while (res != tmpbuf->ptr)
1438 if (*--res == '/') 1483 if (*--res == '/')
1439 break; 1484 break;
1440 1485
1441 continue; 1486 continue;
1442 } 1487 }
1452 1497
1453 /* zero-terminate, for readlink */ 1498 /* zero-terminate, for readlink */
1454 res [len + 1] = 0; 1499 res [len + 1] = 0;
1455 1500
1456 /* now check if it's a symlink */ 1501 /* now check if it's a symlink */
1457 linklen = readlink (req->ptr2, tmp1, PATH_MAX); 1502 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1458 1503
1459 if (linklen < 0) 1504 if (linklen < 0)
1460 { 1505 {
1461 if (errno != EINVAL) 1506 if (errno != EINVAL)
1462 return; 1507 return -1;
1463 1508
1464 /* it's a normal directory. hopefully */ 1509 /* it's a normal directory. hopefully */
1465 res += len + 1; 1510 res += len + 1;
1466 } 1511 }
1467 else 1512 else
1469 /* yay, it was a symlink - build new path in tmp2 */ 1514 /* yay, it was a symlink - build new path in tmp2 */
1470 int rellen = strlen (rel); 1515 int rellen = strlen (rel);
1471 1516
1472 errno = ENAMETOOLONG; 1517 errno = ENAMETOOLONG;
1473 if (linklen + 1 + rellen >= PATH_MAX) 1518 if (linklen + 1 + rellen >= PATH_MAX)
1474 return; 1519 return -1;
1475 1520
1476 errno = ELOOP; 1521 errno = ELOOP;
1477 if (!--symlinks) 1522 if (!--symlinks)
1478 return; 1523 return -1;
1479 1524
1480 if (*tmp1 == '/') 1525 if (*tmp1 == '/')
1481 res = req->ptr2; /* symlink resolves to an absolute path */ 1526 res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1482 1527
1483 /* we need to be careful, as rel might point into tmp2 already */ 1528 /* we need to be careful, as rel might point into tmp2 already */
1484 memmove (tmp2 + linklen + 1, rel, rellen + 1); 1529 memmove (tmp2 + linklen + 1, rel, rellen + 1);
1485 tmp2 [linklen] = '/'; 1530 tmp2 [linklen] = '/';
1486 memcpy (tmp2, tmp1, linklen); 1531 memcpy (tmp2, tmp1, linklen);
1488 rel = tmp2; 1533 rel = tmp2;
1489 } 1534 }
1490 } 1535 }
1491 1536
1492 /* special case for the lone root path */ 1537 /* special case for the lone root path */
1493 if (res == req->ptr2) 1538 if (res == tmpbuf->ptr)
1494 *res++ = '/'; 1539 *res++ = '/';
1495 1540
1496 req->result = res - (char *)req->ptr2; 1541 return res - (char *)tmpbuf->ptr;
1497
1498done:
1499 req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1500} 1542}
1501 1543
1502static signed char 1544static signed char
1503eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1545eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1504{ 1546{
1692#ifdef _WIN32 1734#ifdef _WIN32
1693 { 1735 {
1694 int len = strlen ((const char *)req->ptr1); 1736 int len = strlen ((const char *)req->ptr1);
1695 char *path = malloc (MAX_PATH); 1737 char *path = malloc (MAX_PATH);
1696 const char *fmt; 1738 const char *fmt;
1739 const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1697 1740
1698 if (!len) 1741 if (!len)
1699 fmt = "./*"; 1742 fmt = "./*";
1700 else if (((const char *)req->ptr1)[len - 1] == '/' || ((const char *)req->ptr1)[len - 1] == '\\') 1743 else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1701 fmt = "%s*"; 1744 fmt = "%s*";
1702 else 1745 else
1703 fmt = "%s/*"; 1746 fmt = "%s/*";
1704 1747
1705 _snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1); 1748 _snprintf (path, MAX_PATH, fmt, reqpath);
1706 dirp = FindFirstFile (path, &entp); 1749 dirp = FindFirstFile (path, &entp);
1707 free (path); 1750 free (path);
1708 1751
1709 if (dirp == INVALID_HANDLE_VALUE) 1752 if (dirp == INVALID_HANDLE_VALUE)
1710 { 1753 {
1711 dirp = 0;
1712
1713 /* should steal _dosmaperr */ 1754 /* should steal _dosmaperr */
1714 switch (GetLastError ()) 1755 switch (GetLastError ())
1715 { 1756 {
1716 case ERROR_FILE_NOT_FOUND: 1757 case ERROR_FILE_NOT_FOUND:
1717 req->result = 0; 1758 req->result = 0;
1718 break; 1759 break;
1719 1760
1720 case ERROR_INVALID_NAME: 1761 case ERROR_INVALID_NAME:
1721 case ERROR_PATH_NOT_FOUND: 1762 case ERROR_PATH_NOT_FOUND:
1722 case ERROR_NO_MORE_FILES: 1763 case ERROR_NO_MORE_FILES:
1723 errno = ENOENT; 1764 errno = ENOENT;
1724 break; 1765 break;
1725 1766
1726 case ERROR_NOT_ENOUGH_MEMORY: 1767 case ERROR_NOT_ENOUGH_MEMORY:
1727 errno = ENOMEM; 1768 errno = ENOMEM;
1728 break; 1769 break;
1729 1770
1730 default: 1771 default:
1731 errno = EINVAL; 1772 errno = EINVAL;
1732 break; 1773 break;
1733 } 1774 }
1775
1776 return;
1734 } 1777 }
1735 } 1778 }
1736#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
1737 dirp = opendir (req->ptr1); 1791 dirp = opendir (req->ptr1);
1792 #else
1793 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
1794 #endif
1795
1796 if (!dirp)
1797 return;
1738#endif 1798#endif
1739 1799
1740 if (req->flags & EIO_FLAG_PTR1_FREE) 1800 if (req->flags & EIO_FLAG_PTR1_FREE)
1741 free (req->ptr1); 1801 free (req->ptr1);
1742 1802
1743 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1803 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1744 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1804 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1745 req->ptr2 = names = malloc (namesalloc); 1805 req->ptr2 = names = malloc (namesalloc);
1746 1806
1747 if (dirp && names && (!flags || dents)) 1807 if (!names || (flags && !dents))
1808 return;
1809
1748 for (;;) 1810 for (;;)
1749 { 1811 {
1750 int done; 1812 int done;
1751 1813
1752#ifdef _WIN32 1814#ifdef _WIN32
1753 done = !dirp; 1815 done = !dirp;
1754#else 1816#else
1755 errno = 0; 1817 errno = 0;
1756 entp = readdir (dirp); 1818 entp = readdir (dirp);
1757 done = !entp; 1819 done = !entp;
1758#endif 1820#endif
1759 1821
1760 if (done) 1822 if (done)
1761 { 1823 {
1762#ifndef _WIN32 1824#ifndef _WIN32
1763 int old_errno = errno; 1825 int old_errno = errno;
1764 closedir (dirp); 1826 closedir (dirp);
1765 errno = old_errno; 1827 errno = old_errno;
1766 1828
1767 if (errno) 1829 if (errno)
1768 break; 1830 break;
1769#endif 1831#endif
1770 1832
1771 /* sort etc. */ 1833 /* sort etc. */
1772 req->int1 = flags; 1834 req->int1 = flags;
1773 req->result = dentoffs; 1835 req->result = dentoffs;
1774 1836
1775 if (flags & EIO_READDIR_STAT_ORDER) 1837 if (flags & EIO_READDIR_STAT_ORDER)
1776 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits); 1838 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1777 else if (flags & EIO_READDIR_DIRS_FIRST) 1839 else if (flags & EIO_READDIR_DIRS_FIRST)
1778 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1840 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1779 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */ 1841 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1780 else 1842 else
1843 {
1844 /* in this case, all is known, and we just put dirs first and sort them */
1845 eio_dirent *oth = dents + dentoffs;
1846 eio_dirent *dir = dents;
1847
1848 /* now partition dirs to the front, and non-dirs to the back */
1849 /* by walking from both sides and swapping if necessary */
1850 while (oth > dir)
1851 {
1852 if (dir->type == EIO_DT_DIR)
1853 ++dir;
1854 else if ((--oth)->type == EIO_DT_DIR)
1855 {
1856 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1857
1858 ++dir;
1859 }
1860 }
1861
1862 /* now sort the dirs only (dirs all have the same score) */
1863 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1864 }
1865
1866 break;
1867 }
1868
1869 /* now add the entry to our list(s) */
1870 name = D_NAME (entp);
1871
1872 /* skip . and .. entries */
1873 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1874 {
1875 int len = D_NAMLEN (entp) + 1;
1876
1877 while (ecb_expect_false (namesoffs + len > namesalloc))
1878 {
1879 namesalloc *= 2;
1880 req->ptr2 = names = realloc (names, namesalloc);
1881
1882 if (!names)
1883 break;
1884 }
1885
1886 memcpy (names + namesoffs, name, len);
1887
1888 if (dents)
1889 {
1890 struct eio_dirent *ent;
1891
1892 if (ecb_expect_false (dentoffs == dentalloc))
1781 { 1893 {
1782 /* in this case, all is known, and we just put dirs first and sort them */ 1894 dentalloc *= 2;
1895 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1896
1897 if (!dents)
1898 break;
1899 }
1900
1783 eio_dirent *oth = dents + dentoffs; 1901 ent = dents + dentoffs;
1784 eio_dirent *dir = dents;
1785 1902
1786 /* now partition dirs to the front, and non-dirs to the back */ 1903 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1787 /* by walking from both sides and swapping if necessary */ 1904 ent->namelen = len - 1;
1788 while (oth > dir) 1905 ent->inode = D_INO (entp);
1906
1907 inode_bits |= ent->inode;
1908
1909 switch (D_TYPE (entp))
1910 {
1911 default:
1912 ent->type = EIO_DT_UNKNOWN;
1913 flags |= EIO_READDIR_FOUND_UNKNOWN;
1914 break;
1915
1916 #ifdef DT_FIFO
1917 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1918 #endif
1919 #ifdef DT_CHR
1920 case DT_CHR: ent->type = EIO_DT_CHR; break;
1921 #endif
1922 #ifdef DT_MPC
1923 case DT_MPC: ent->type = EIO_DT_MPC; break;
1924 #endif
1925 #ifdef DT_DIR
1926 case DT_DIR: ent->type = EIO_DT_DIR; break;
1927 #endif
1928 #ifdef DT_NAM
1929 case DT_NAM: ent->type = EIO_DT_NAM; break;
1930 #endif
1931 #ifdef DT_BLK
1932 case DT_BLK: ent->type = EIO_DT_BLK; break;
1933 #endif
1934 #ifdef DT_MPB
1935 case DT_MPB: ent->type = EIO_DT_MPB; break;
1936 #endif
1937 #ifdef DT_REG
1938 case DT_REG: ent->type = EIO_DT_REG; break;
1939 #endif
1940 #ifdef DT_NWK
1941 case DT_NWK: ent->type = EIO_DT_NWK; break;
1942 #endif
1943 #ifdef DT_CMP
1944 case DT_CMP: ent->type = EIO_DT_CMP; break;
1945 #endif
1946 #ifdef DT_LNK
1947 case DT_LNK: ent->type = EIO_DT_LNK; break;
1948 #endif
1949 #ifdef DT_SOCK
1950 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1951 #endif
1952 #ifdef DT_DOOR
1953 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1954 #endif
1955 #ifdef DT_WHT
1956 case DT_WHT: ent->type = EIO_DT_WHT; break;
1957 #endif
1958 }
1959
1960 ent->score = 7;
1961
1962 if (flags & EIO_READDIR_DIRS_FIRST)
1963 {
1964 if (ent->type == EIO_DT_UNKNOWN)
1789 { 1965 {
1790 if (dir->type == EIO_DT_DIR) 1966 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1791 ++dir; 1967 ent->score = 1;
1792 else if ((--oth)->type == EIO_DT_DIR) 1968 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1793 { 1969 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1794 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1795
1796 ++dir;
1797 }
1798 } 1970 }
1799 1971 else if (ent->type == EIO_DT_DIR)
1800 /* now sort the dirs only (dirs all have the same score) */ 1972 ent->score = 0;
1801 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1802 } 1973 }
1803
1804 break;
1805 }
1806
1807 /* now add the entry to our list(s) */
1808 name = D_NAME (entp);
1809
1810 /* skip . and .. entries */
1811 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1812 {
1813 int len = D_NAMLEN (entp) + 1;
1814
1815 while (ecb_expect_false (namesoffs + len > namesalloc))
1816 {
1817 namesalloc *= 2;
1818 req->ptr2 = names = realloc (names, namesalloc);
1819
1820 if (!names)
1821 break;
1822 } 1974 }
1823 1975
1824 memcpy (names + namesoffs, name, len);
1825
1826 if (dents)
1827 {
1828 struct eio_dirent *ent;
1829
1830 if (ecb_expect_false (dentoffs == dentalloc))
1831 {
1832 dentalloc *= 2;
1833 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1834
1835 if (!dents)
1836 break;
1837 }
1838
1839 ent = dents + dentoffs;
1840
1841 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1842 ent->namelen = len - 1;
1843 ent->inode = D_INO (entp);
1844
1845 inode_bits |= ent->inode;
1846
1847 switch (D_TYPE (entp))
1848 {
1849 default:
1850 ent->type = EIO_DT_UNKNOWN;
1851 flags |= EIO_READDIR_FOUND_UNKNOWN;
1852 break;
1853
1854 #ifdef DT_FIFO
1855 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1856 #endif
1857 #ifdef DT_CHR
1858 case DT_CHR: ent->type = EIO_DT_CHR; break;
1859 #endif
1860 #ifdef DT_MPC
1861 case DT_MPC: ent->type = EIO_DT_MPC; break;
1862 #endif
1863 #ifdef DT_DIR
1864 case DT_DIR: ent->type = EIO_DT_DIR; break;
1865 #endif
1866 #ifdef DT_NAM
1867 case DT_NAM: ent->type = EIO_DT_NAM; break;
1868 #endif
1869 #ifdef DT_BLK
1870 case DT_BLK: ent->type = EIO_DT_BLK; break;
1871 #endif
1872 #ifdef DT_MPB
1873 case DT_MPB: ent->type = EIO_DT_MPB; break;
1874 #endif
1875 #ifdef DT_REG
1876 case DT_REG: ent->type = EIO_DT_REG; break;
1877 #endif
1878 #ifdef DT_NWK
1879 case DT_NWK: ent->type = EIO_DT_NWK; break;
1880 #endif
1881 #ifdef DT_CMP
1882 case DT_CMP: ent->type = EIO_DT_CMP; break;
1883 #endif
1884 #ifdef DT_LNK
1885 case DT_LNK: ent->type = EIO_DT_LNK; break;
1886 #endif
1887 #ifdef DT_SOCK
1888 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1889 #endif
1890 #ifdef DT_DOOR
1891 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1892 #endif
1893 #ifdef DT_WHT
1894 case DT_WHT: ent->type = EIO_DT_WHT; break;
1895 #endif
1896 }
1897
1898 ent->score = 7;
1899
1900 if (flags & EIO_READDIR_DIRS_FIRST)
1901 {
1902 if (ent->type == EIO_DT_UNKNOWN)
1903 {
1904 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1905 ent->score = 1;
1906 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1907 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1908 }
1909 else if (ent->type == EIO_DT_DIR)
1910 ent->score = 0;
1911 }
1912 }
1913
1914 namesoffs += len; 1976 namesoffs += len;
1915 ++dentoffs; 1977 ++dentoffs;
1916 } 1978 }
1917 1979
1918 if (EIO_CANCELLED (req)) 1980 if (EIO_CANCELLED (req))
1919 { 1981 {
1920 errno = ECANCELED; 1982 errno = ECANCELED;
1921 break; 1983 break;
1922 } 1984 }
1923 1985
1924#ifdef _WIN32 1986#ifdef _WIN32
1925 if (!FindNextFile (dirp, &entp)) 1987 if (!FindNextFile (dirp, &entp))
1926 { 1988 {
1927 FindClose (dirp); 1989 FindClose (dirp);
1928 dirp = 0; 1990 dirp = 0;
1929 } 1991 }
1930#endif 1992#endif
1931 } 1993 }
1932} 1994}
1995
1996/*****************************************************************************/
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;
2040
2041#if HAVE_AT
2042 fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
2043
2044 if (fd < 0)
2045 return EIO_INVALID_WD;
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}
2060
2061eio_wd
2062eio_wd_open_sync (eio_wd wd, const char *path)
2063{
2064 struct tmpbuf tmpbuf = { 0 };
2065 wd = eio__wd_open_sync (&tmpbuf, wd, path);
2066 free (tmpbuf.ptr);
2067
2068 return wd;
2069}
2070
2071void
2072eio_wd_close_sync (eio_wd wd)
2073{
2074 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
2075 {
2076 #if HAVE_AT
2077 close (wd->fd);
2078 #endif
2079 free (wd);
2080 }
2081}
2082
2083#if HAVE_AT
2084
2085/* they forgot these */
2086
2087static int
2088eio__truncateat (int dirfd, const char *path, off_t length)
2089{
2090 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
2091 int res;
2092
2093 if (fd < 0)
2094 return fd;
2095
2096 res = ftruncate (fd, length);
2097 close (fd);
2098 return res;
2099}
2100
2101static int
2102eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
2103{
2104 int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC);
2105 int res;
2106
2107 if (fd < 0)
2108 return fd;
2109
2110 res = fstatvfs (fd, buf);
2111 close (fd);
2112 return res;
2113
2114}
2115
2116#endif
1933 2117
1934/*****************************************************************************/ 2118/*****************************************************************************/
1935 2119
1936#define ALLOC(len) \ 2120#define ALLOC(len) \
1937 if (!req->ptr2) \ 2121 if (!req->ptr2) \
1967 2151
1968 X_LOCK (reqlock); 2152 X_LOCK (reqlock);
1969 2153
1970 for (;;) 2154 for (;;)
1971 { 2155 {
1972 self->req = req = reqq_shift (&req_queue); 2156 req = reqq_shift (&req_queue);
1973 2157
1974 if (req) 2158 if (req)
1975 break; 2159 break;
1976 2160
1977 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */ 2161 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
2015 ++npending; 2199 ++npending;
2016 2200
2017 if (!reqq_push (&res_queue, req) && want_poll_cb) 2201 if (!reqq_push (&res_queue, req) && want_poll_cb)
2018 want_poll_cb (); 2202 want_poll_cb ();
2019 2203
2020 self->req = 0;
2021 etp_worker_clear (self); 2204 etp_worker_clear (self);
2022 2205
2023 X_UNLOCK (reslock); 2206 X_UNLOCK (reslock);
2024 } 2207 }
2025 2208
2026quit: 2209quit:
2210 free (req);
2211
2027 X_LOCK (wrklock); 2212 X_LOCK (wrklock);
2028 etp_worker_free (self); 2213 etp_worker_free (self);
2029 X_UNLOCK (wrklock); 2214 X_UNLOCK (wrklock);
2030 2215
2031 return 0; 2216 return 0;
2074 } 2259 }
2075 2260
2076static void 2261static void
2077eio_execute (etp_worker *self, eio_req *req) 2262eio_execute (etp_worker *self, eio_req *req)
2078{ 2263{
2264#if HAVE_AT
2265 int dirfd;
2266#else
2267 const char *path;
2268#endif
2269
2079 if (ecb_expect_false (EIO_CANCELLED (req))) 2270 if (ecb_expect_false (EIO_CANCELLED (req)))
2080 { 2271 {
2081 req->result = -1; 2272 req->result = -1;
2082 req->errorno = ECANCELED; 2273 req->errorno = ECANCELED;
2083 return; 2274 return;
2084 } 2275 }
2085 2276
2277 if (ecb_expect_false (req->wd == EIO_INVALID_WD))
2278 {
2279 req->result = -1;
2280 req->errorno = ENOENT;
2281 return;
2282 }
2283
2284 if (req->type >= EIO_OPEN)
2285 {
2286 #if HAVE_AT
2287 dirfd = WD2FD (req->wd);
2288 #else
2289 path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
2290 #endif
2291 }
2292
2086 switch (req->type) 2293 switch (req->type)
2087 { 2294 {
2295 case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
2296 req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
2297 break;
2298 case EIO_WD_CLOSE: req->result = 0;
2299 eio_wd_close_sync (req->wd); break;
2300
2088 case EIO_READ: ALLOC (req->size); 2301 case EIO_READ: ALLOC (req->size);
2089 req->result = req->offs >= 0 2302 req->result = req->offs >= 0
2090 ? pread (req->int1, req->ptr2, req->size, req->offs) 2303 ? pread (req->int1, req->ptr2, req->size, req->offs)
2091 : read (req->int1, req->ptr2, req->size); break; 2304 : read (req->int1, req->ptr2, req->size); break;
2092 case EIO_WRITE: req->result = req->offs >= 0 2305 case EIO_WRITE: req->result = req->offs >= 0
2094 : write (req->int1, req->ptr2, req->size); break; 2307 : write (req->int1, req->ptr2, req->size); break;
2095 2308
2096 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 2309 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
2097 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break; 2310 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
2098 2311
2312#if HAVE_AT
2313
2099 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2314 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2100 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2315 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
2101 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2316 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2317 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
2318 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
2319 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
2320 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
2321 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
2322
2323 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
2324 case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
2325 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
2326 case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
2327 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
2328 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
2329 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2330 case EIO_READLINK: ALLOC (PATH_MAX);
2331 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
2332 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2333 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2334 case EIO_UTIME:
2335 case EIO_FUTIME:
2336 {
2337 struct timespec ts[2];
2338 struct timespec *times;
2339
2340 if (req->nv1 != -1. || req->nv2 != -1.)
2341 {
2342 ts[0].tv_sec = req->nv1;
2343 ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
2344 ts[1].tv_sec = req->nv2;
2345 ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
2346
2347 times = ts;
2348 }
2349 else
2350 times = 0;
2351
2352 req->result = req->type == EIO_FUTIME
2353 ? futimens (req->int1, times)
2354 : utimensat (dirfd, req->ptr1, times, 0);
2355 }
2356 break;
2357
2358#else
2359
2360 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2361 req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2362 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2102 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2363 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2364 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
2365 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
2366 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
2367 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
2368
2369 case EIO_UNLINK: req->result = unlink (path ); break;
2370 case EIO_RMDIR: req->result = rmdir (path ); break;
2371 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
2372 case EIO_RENAME: req->result = rename (path , req->ptr2); break;
2373 case EIO_LINK: req->result = link (path , req->ptr2); break;
2374 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
2375 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
2376 case EIO_READLINK: ALLOC (PATH_MAX);
2377 req->result = readlink (path, req->ptr2, PATH_MAX); break;
2378 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2379 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
2380
2381 case EIO_UTIME:
2382 case EIO_FUTIME:
2383 {
2384 struct timeval tv[2];
2385 struct timeval *times;
2386
2387 if (req->nv1 != -1. || req->nv2 != -1.)
2388 {
2389 tv[0].tv_sec = req->nv1;
2390 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
2391 tv[1].tv_sec = req->nv2;
2392 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
2393
2394 times = tv;
2395 }
2396 else
2397 times = 0;
2398
2399 req->result = req->type == EIO_FUTIME
2400 ? futimes (req->int1, times)
2401 : utimes (req->ptr1, times);
2402 }
2403 break;
2404
2405#endif
2406
2407 case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
2408 {
2409 ALLOC (req->result);
2410 memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
2411 }
2412 break;
2413
2103 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2414 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2104 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 2415 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
2105 2416
2106 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2107 req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2108 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 2417 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2109 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 2418 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2110 2419
2111 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
2112 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break; 2420 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
2113 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
2114 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break; 2421 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
2115 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
2116 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break; 2422 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2117 2423
2118 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
2119 case EIO_CLOSE: req->result = close (req->int1); break; 2424 case EIO_CLOSE: req->result = close (req->int1); break;
2120 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 2425 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
2121 case EIO_UNLINK: req->result = unlink (req->ptr1); break;
2122 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
2123 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
2124 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
2125 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
2126 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
2127 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2128
2129 case EIO_REALPATH: eio__realpath (req, self); break;
2130
2131 case EIO_READLINK: ALLOC (PATH_MAX);
2132 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
2133
2134 case EIO_SYNC: req->result = 0; sync (); break; 2426 case EIO_SYNC: req->result = 0; sync (); break;
2135 case EIO_FSYNC: req->result = fsync (req->int1); break; 2427 case EIO_FSYNC: req->result = fsync (req->int1); break;
2136 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2428 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2137 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break; 2429 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
2138 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break; 2430 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2157 req->result = select (0, 0, 0, 0, &tv); 2449 req->result = select (0, 0, 0, 0, &tv);
2158 } 2450 }
2159#endif 2451#endif
2160 break; 2452 break;
2161 2453
2162 case EIO_UTIME:
2163 case EIO_FUTIME:
2164 {
2165 struct timeval tv[2];
2166 struct timeval *times;
2167
2168 if (req->nv1 != -1. || req->nv2 != -1.)
2169 {
2170 tv[0].tv_sec = req->nv1;
2171 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
2172 tv[1].tv_sec = req->nv2;
2173 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
2174
2175 times = tv;
2176 }
2177 else
2178 times = 0;
2179
2180 req->result = req->type == EIO_FUTIME
2181 ? futimes (req->int1, times)
2182 : utimes (req->ptr1, times);
2183 }
2184 break;
2185
2186 case EIO_GROUP: 2454 case EIO_GROUP:
2187 abort (); /* handled in eio_request */ 2455 abort (); /* handled in eio_request */
2188 2456
2189 case EIO_NOP: 2457 case EIO_NOP:
2190 req->result = 0; 2458 req->result = 0;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines