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.115 by root, Tue Mar 27 18:54:45 2012 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
366#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 409#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
367#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) 410#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
368 411
369/* worker threads management */ 412/* worker threads management */
370 413
371static void ecb_cold 414static void
372etp_worker_clear (etp_worker *wrk) 415etp_worker_clear (etp_worker *wrk)
373{ 416{
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);
1049 dBUF; 1094 dBUF;
1050 1095
1051 while (todo > 0) 1096 while (todo > 0)
1052 { 1097 {
1053 size_t len = todo < EIO_BUFSIZE ? todo : EIO_BUFSIZE; 1098 size_t len = todo < EIO_BUFSIZE ? todo : EIO_BUFSIZE;
1054
1055 pread (fd, eio_buf, len, offset);
1056 offset += len; 1099 offset += len;
1057 todo -= len; 1100 todo -= len;
1058 } 1101 }
1059 1102
1060 FUBd; 1103 FUBd;
1061 1104
1062 errno = 0; 1105 /* linux's readahead basically only fails for EBADF or EINVAL (not mmappable) */
1106 /* but not for e.g. EIO or eof, so we also never fail */
1063 return count; 1107 return 0;
1064} 1108}
1065 1109
1066#endif 1110#endif
1067 1111
1068/* sendfile always needs emulation */ 1112/* sendfile always needs emulation */
1337} 1381}
1338 1382
1339/*****************************************************************************/ 1383/*****************************************************************************/
1340/* requests implemented outside eio_execute, because they are so large */ 1384/* requests implemented outside eio_execute, because they are so large */
1341 1385
1386/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
1342static void 1387static int
1343eio__realpath (eio_req *req, etp_worker *self) 1388eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
1344{ 1389{
1345 char *rel = req->ptr1; 1390 const char *rel = path;
1346 char *res; 1391 char *res;
1347 char *tmp1, *tmp2; 1392 char *tmp1, *tmp2;
1348#if SYMLOOP_MAX > 32 1393#if SYMLOOP_MAX > 32
1349 int symlinks = SYMLOOP_MAX; 1394 int symlinks = SYMLOOP_MAX;
1350#else 1395#else
1351 int symlinks = 32; 1396 int symlinks = 32;
1352#endif 1397#endif
1353 1398
1354 req->result = -1;
1355
1356 errno = EINVAL; 1399 errno = EINVAL;
1357 if (!rel) 1400 if (!rel)
1358 return; 1401 return -1;
1359 1402
1360 errno = ENOENT; 1403 errno = ENOENT;
1361 if (!*rel) 1404 if (!*rel)
1362 return; 1405 return -1;
1363 1406
1364 if (!req->ptr2) 1407 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; 1408 tmp1 = res + PATH_MAX;
1378 tmp2 = tmp1 + PATH_MAX; 1409 tmp2 = tmp1 + PATH_MAX;
1379 1410
1380#if 0 /* disabled, the musl way to do things is just too racy */ 1411#if 0 /* disabled, the musl way to do things is just too racy */
1381#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1412#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1400#endif 1431#endif
1401#endif 1432#endif
1402 1433
1403 if (*rel != '/') 1434 if (*rel != '/')
1404 { 1435 {
1436 int len;
1437
1438 errno = ENOENT;
1439 if (wd == EIO_INVALID_WD)
1440 return -1;
1441
1442 if (wd == EIO_CWD)
1443 {
1405 if (!getcwd (res, PATH_MAX)) 1444 if (!getcwd (res, PATH_MAX))
1406 return; 1445 return -1;
1446
1447 len = strlen (res);
1448 }
1449 else
1450 memcpy (res, wd->str, len = wd->len);
1407 1451
1408 if (res [1]) /* only use if not / */ 1452 if (res [1]) /* only use if not / */
1409 res += strlen (res); 1453 res += len;
1410 } 1454 }
1411 1455
1412 while (*rel) 1456 while (*rel)
1413 { 1457 {
1414 eio_ssize_t len, linklen; 1458 eio_ssize_t len, linklen;
1415 char *beg = rel; 1459 const char *beg = rel;
1416 1460
1417 while (*rel && *rel != '/') 1461 while (*rel && *rel != '/')
1418 ++rel; 1462 ++rel;
1419 1463
1420 len = rel - beg; 1464 len = rel - beg;
1432 1476
1433 if (beg [1] == '.' && len == 2) 1477 if (beg [1] == '.' && len == 2)
1434 { 1478 {
1435 /* .. - back up one component, if possible */ 1479 /* .. - back up one component, if possible */
1436 1480
1437 while (res != req->ptr2) 1481 while (res != tmpbuf->ptr)
1438 if (*--res == '/') 1482 if (*--res == '/')
1439 break; 1483 break;
1440 1484
1441 continue; 1485 continue;
1442 } 1486 }
1443 } 1487 }
1444 1488
1445 errno = ENAMETOOLONG; 1489 errno = ENAMETOOLONG;
1446 if (res + 1 + len + 1 >= tmp1) 1490 if (res + 1 + len + 1 >= tmp1)
1447 return; 1491 return -1;
1448 1492
1449 /* copy one component */ 1493 /* copy one component */
1450 *res = '/'; 1494 *res = '/';
1451 memcpy (res + 1, beg, len); 1495 memcpy (res + 1, beg, len);
1452 1496
1453 /* zero-terminate, for readlink */ 1497 /* zero-terminate, for readlink */
1454 res [len + 1] = 0; 1498 res [len + 1] = 0;
1455 1499
1456 /* now check if it's a symlink */ 1500 /* now check if it's a symlink */
1457 linklen = readlink (req->ptr2, tmp1, PATH_MAX); 1501 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1458 1502
1459 if (linklen < 0) 1503 if (linklen < 0)
1460 { 1504 {
1461 if (errno != EINVAL) 1505 if (errno != EINVAL)
1462 return; 1506 return -1;
1463 1507
1464 /* it's a normal directory. hopefully */ 1508 /* it's a normal directory. hopefully */
1465 res += len + 1; 1509 res += len + 1;
1466 } 1510 }
1467 else 1511 else
1469 /* yay, it was a symlink - build new path in tmp2 */ 1513 /* yay, it was a symlink - build new path in tmp2 */
1470 int rellen = strlen (rel); 1514 int rellen = strlen (rel);
1471 1515
1472 errno = ENAMETOOLONG; 1516 errno = ENAMETOOLONG;
1473 if (linklen + 1 + rellen >= PATH_MAX) 1517 if (linklen + 1 + rellen >= PATH_MAX)
1474 return; 1518 return -1;
1475 1519
1476 errno = ELOOP; 1520 errno = ELOOP;
1477 if (!--symlinks) 1521 if (!--symlinks)
1478 return; 1522 return -1;
1479 1523
1480 if (*tmp1 == '/') 1524 if (*tmp1 == '/')
1481 res = req->ptr2; /* symlink resolves to an absolute path */ 1525 res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1482 1526
1483 /* we need to be careful, as rel might point into tmp2 already */ 1527 /* we need to be careful, as rel might point into tmp2 already */
1484 memmove (tmp2 + linklen + 1, rel, rellen + 1); 1528 memmove (tmp2 + linklen + 1, rel, rellen + 1);
1485 tmp2 [linklen] = '/'; 1529 tmp2 [linklen] = '/';
1486 memcpy (tmp2, tmp1, linklen); 1530 memcpy (tmp2, tmp1, linklen);
1488 rel = tmp2; 1532 rel = tmp2;
1489 } 1533 }
1490 } 1534 }
1491 1535
1492 /* special case for the lone root path */ 1536 /* special case for the lone root path */
1493 if (res == req->ptr2) 1537 if (res == tmpbuf->ptr)
1494 *res++ = '/'; 1538 *res++ = '/';
1495 1539
1496 req->result = res - (char *)req->ptr2; 1540 return res - (char *)tmpbuf->ptr;
1497
1498done:
1499 req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1500} 1541}
1501 1542
1502static signed char 1543static signed char
1503eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1544eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1504{ 1545{
1692#ifdef _WIN32 1733#ifdef _WIN32
1693 { 1734 {
1694 int len = strlen ((const char *)req->ptr1); 1735 int len = strlen ((const char *)req->ptr1);
1695 char *path = malloc (MAX_PATH); 1736 char *path = malloc (MAX_PATH);
1696 const char *fmt; 1737 const char *fmt;
1738 const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1697 1739
1698 if (!len) 1740 if (!len)
1699 fmt = "./*"; 1741 fmt = "./*";
1700 else if (((const char *)req->ptr1)[len - 1] == '/' || ((const char *)req->ptr1)[len - 1] == '\\') 1742 else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1701 fmt = "%s*"; 1743 fmt = "%s*";
1702 else 1744 else
1703 fmt = "%s/*"; 1745 fmt = "%s/*";
1704 1746
1705 _snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1); 1747 _snprintf (path, MAX_PATH, fmt, reqpath);
1706 dirp = FindFirstFile (path, &entp); 1748 dirp = FindFirstFile (path, &entp);
1707 free (path); 1749 free (path);
1708 1750
1709 if (dirp == INVALID_HANDLE_VALUE) 1751 if (dirp == INVALID_HANDLE_VALUE)
1710 { 1752 {
1711 dirp = 0;
1712
1713 /* should steal _dosmaperr */ 1753 /* should steal _dosmaperr */
1714 switch (GetLastError ()) 1754 switch (GetLastError ())
1715 { 1755 {
1716 case ERROR_FILE_NOT_FOUND: 1756 case ERROR_FILE_NOT_FOUND:
1717 req->result = 0; 1757 req->result = 0;
1718 break; 1758 break;
1719 1759
1720 case ERROR_INVALID_NAME: 1760 case ERROR_INVALID_NAME:
1721 case ERROR_PATH_NOT_FOUND: 1761 case ERROR_PATH_NOT_FOUND:
1722 case ERROR_NO_MORE_FILES: 1762 case ERROR_NO_MORE_FILES:
1723 errno = ENOENT; 1763 errno = ENOENT;
1724 break; 1764 break;
1725 1765
1726 case ERROR_NOT_ENOUGH_MEMORY: 1766 case ERROR_NOT_ENOUGH_MEMORY:
1727 errno = ENOMEM; 1767 errno = ENOMEM;
1728 break; 1768 break;
1729 1769
1730 default: 1770 default:
1731 errno = EINVAL; 1771 errno = EINVAL;
1732 break; 1772 break;
1733 } 1773 }
1774
1775 return;
1734 } 1776 }
1735 } 1777 }
1736#else 1778#else
1779 #if HAVE_AT
1780 if (req->wd)
1781 {
1782 int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1783
1784 if (fd < 0)
1785 return;
1786
1787 dirp = fdopendir (fd);
1788
1789 if (!dirp)
1790 close (fd);
1791 }
1792 else
1737 dirp = opendir (req->ptr1); 1793 dirp = opendir (req->ptr1);
1794 #else
1795 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
1796 #endif
1797
1798 if (!dirp)
1799 return;
1738#endif 1800#endif
1739 1801
1740 if (req->flags & EIO_FLAG_PTR1_FREE) 1802 if (req->flags & EIO_FLAG_PTR1_FREE)
1741 free (req->ptr1); 1803 free (req->ptr1);
1742 1804
1743 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1805 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1744 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1806 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1745 req->ptr2 = names = malloc (namesalloc); 1807 req->ptr2 = names = malloc (namesalloc);
1746 1808
1747 if (dirp && names && (!flags || dents)) 1809 if (!names || (flags && !dents))
1810 return;
1811
1748 for (;;) 1812 for (;;)
1749 { 1813 {
1750 int done; 1814 int done;
1751 1815
1752#ifdef _WIN32 1816#ifdef _WIN32
1753 done = !dirp; 1817 done = !dirp;
1754#else 1818#else
1755 errno = 0; 1819 errno = 0;
1756 entp = readdir (dirp); 1820 entp = readdir (dirp);
1757 done = !entp; 1821 done = !entp;
1758#endif 1822#endif
1759 1823
1760 if (done) 1824 if (done)
1761 { 1825 {
1762#ifndef _WIN32 1826#ifndef _WIN32
1763 int old_errno = errno; 1827 int old_errno = errno;
1764 closedir (dirp); 1828 closedir (dirp);
1765 errno = old_errno; 1829 errno = old_errno;
1766 1830
1767 if (errno) 1831 if (errno)
1768 break; 1832 break;
1769#endif 1833#endif
1770 1834
1771 /* sort etc. */ 1835 /* sort etc. */
1772 req->int1 = flags; 1836 req->int1 = flags;
1773 req->result = dentoffs; 1837 req->result = dentoffs;
1774 1838
1775 if (flags & EIO_READDIR_STAT_ORDER) 1839 if (flags & EIO_READDIR_STAT_ORDER)
1776 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits); 1840 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1777 else if (flags & EIO_READDIR_DIRS_FIRST) 1841 else if (flags & EIO_READDIR_DIRS_FIRST)
1778 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1842 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1779 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */ 1843 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1780 else 1844 else
1845 {
1846 /* in this case, all is known, and we just put dirs first and sort them */
1847 eio_dirent *oth = dents + dentoffs;
1848 eio_dirent *dir = dents;
1849
1850 /* now partition dirs to the front, and non-dirs to the back */
1851 /* by walking from both sides and swapping if necessary */
1852 while (oth > dir)
1853 {
1854 if (dir->type == EIO_DT_DIR)
1855 ++dir;
1856 else if ((--oth)->type == EIO_DT_DIR)
1857 {
1858 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1859
1860 ++dir;
1861 }
1862 }
1863
1864 /* now sort the dirs only (dirs all have the same score) */
1865 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1866 }
1867
1868 break;
1869 }
1870
1871 /* now add the entry to our list(s) */
1872 name = D_NAME (entp);
1873
1874 /* skip . and .. entries */
1875 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1876 {
1877 int len = D_NAMLEN (entp) + 1;
1878
1879 while (ecb_expect_false (namesoffs + len > namesalloc))
1880 {
1881 namesalloc *= 2;
1882 req->ptr2 = names = realloc (names, namesalloc);
1883
1884 if (!names)
1885 break;
1886 }
1887
1888 memcpy (names + namesoffs, name, len);
1889
1890 if (dents)
1891 {
1892 struct eio_dirent *ent;
1893
1894 if (ecb_expect_false (dentoffs == dentalloc))
1781 { 1895 {
1782 /* in this case, all is known, and we just put dirs first and sort them */ 1896 dentalloc *= 2;
1897 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1898
1899 if (!dents)
1900 break;
1901 }
1902
1783 eio_dirent *oth = dents + dentoffs; 1903 ent = dents + dentoffs;
1784 eio_dirent *dir = dents;
1785 1904
1786 /* now partition dirs to the front, and non-dirs to the back */ 1905 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1787 /* by walking from both sides and swapping if necessary */ 1906 ent->namelen = len - 1;
1788 while (oth > dir) 1907 ent->inode = D_INO (entp);
1908
1909 inode_bits |= ent->inode;
1910
1911 switch (D_TYPE (entp))
1912 {
1913 default:
1914 ent->type = EIO_DT_UNKNOWN;
1915 flags |= EIO_READDIR_FOUND_UNKNOWN;
1916 break;
1917
1918 #ifdef DT_FIFO
1919 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1920 #endif
1921 #ifdef DT_CHR
1922 case DT_CHR: ent->type = EIO_DT_CHR; break;
1923 #endif
1924 #ifdef DT_MPC
1925 case DT_MPC: ent->type = EIO_DT_MPC; break;
1926 #endif
1927 #ifdef DT_DIR
1928 case DT_DIR: ent->type = EIO_DT_DIR; break;
1929 #endif
1930 #ifdef DT_NAM
1931 case DT_NAM: ent->type = EIO_DT_NAM; break;
1932 #endif
1933 #ifdef DT_BLK
1934 case DT_BLK: ent->type = EIO_DT_BLK; break;
1935 #endif
1936 #ifdef DT_MPB
1937 case DT_MPB: ent->type = EIO_DT_MPB; break;
1938 #endif
1939 #ifdef DT_REG
1940 case DT_REG: ent->type = EIO_DT_REG; break;
1941 #endif
1942 #ifdef DT_NWK
1943 case DT_NWK: ent->type = EIO_DT_NWK; break;
1944 #endif
1945 #ifdef DT_CMP
1946 case DT_CMP: ent->type = EIO_DT_CMP; break;
1947 #endif
1948 #ifdef DT_LNK
1949 case DT_LNK: ent->type = EIO_DT_LNK; break;
1950 #endif
1951 #ifdef DT_SOCK
1952 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1953 #endif
1954 #ifdef DT_DOOR
1955 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1956 #endif
1957 #ifdef DT_WHT
1958 case DT_WHT: ent->type = EIO_DT_WHT; break;
1959 #endif
1960 }
1961
1962 ent->score = 7;
1963
1964 if (flags & EIO_READDIR_DIRS_FIRST)
1965 {
1966 if (ent->type == EIO_DT_UNKNOWN)
1789 { 1967 {
1790 if (dir->type == EIO_DT_DIR) 1968 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1791 ++dir; 1969 ent->score = 1;
1792 else if ((--oth)->type == EIO_DT_DIR) 1970 else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1793 { 1971 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 } 1972 }
1799 1973 else if (ent->type == EIO_DT_DIR)
1800 /* now sort the dirs only (dirs all have the same score) */ 1974 ent->score = 0;
1801 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1802 } 1975 }
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 } 1976 }
1823 1977
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; 1978 namesoffs += len;
1915 ++dentoffs; 1979 ++dentoffs;
1916 } 1980 }
1917 1981
1918 if (EIO_CANCELLED (req)) 1982 if (EIO_CANCELLED (req))
1919 { 1983 {
1920 errno = ECANCELED; 1984 errno = ECANCELED;
1921 break; 1985 break;
1922 } 1986 }
1923 1987
1924#ifdef _WIN32 1988#ifdef _WIN32
1925 if (!FindNextFile (dirp, &entp)) 1989 if (!FindNextFile (dirp, &entp))
1926 { 1990 {
1927 FindClose (dirp); 1991 FindClose (dirp);
1928 dirp = 0; 1992 dirp = 0;
1929 } 1993 }
1930#endif 1994#endif
1931 } 1995 }
1932} 1996}
1997
1998/*****************************************************************************/
1999/* working directory stuff */
2000/* various deficiencies in the posix 2008 api force us to */
2001/* keep the absolute path in string form at all times */
2002/* fuck yeah. */
2003
2004#if !HAVE_AT
2005
2006/* a bit like realpath, but usually faster because it doesn'T have to return */
2007/* an absolute or canonical path */
2008static const char *
2009wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2010{
2011 if (!wd || *path == '/')
2012 return path;
2013
2014 if (path [0] == '.' && !path [1])
2015 return wd->str;
2016
2017 {
2018 int l1 = wd->len;
2019 int l2 = strlen (path);
2020
2021 char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2);
2022
2023 memcpy (res, wd->str, l1);
2024 res [l1] = '/';
2025 memcpy (res + l1 + 1, path, l2 + 1);
2026
2027 return res;
2028 }
2029}
2030
2031#endif
2032
2033static eio_wd
2034eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2035{
2036 int fd;
2037 eio_wd res;
2038 int len = eio__realpath (tmpbuf, wd, path);
2039
2040 if (len < 0)
2041 return EIO_INVALID_WD;
2042
2043#if HAVE_AT
2044 fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
2045
2046 if (fd < 0)
2047 return EIO_INVALID_WD;
2048#endif
2049
2050 res = malloc (sizeof (*res) + len); /* one extra 0-byte */
2051
2052#if HAVE_AT
2053 res->fd = fd;
2054#endif
2055
2056 res->len = len;
2057 memcpy (res->str, tmpbuf->ptr, len);
2058 res->str [len] = 0;
2059
2060 return res;
2061}
2062
2063eio_wd
2064eio_wd_open_sync (eio_wd wd, const char *path)
2065{
2066 struct tmpbuf tmpbuf = { 0 };
2067 wd = eio__wd_open_sync (&tmpbuf, wd, path);
2068 free (tmpbuf.ptr);
2069
2070 return wd;
2071}
2072
2073void
2074eio_wd_close_sync (eio_wd wd)
2075{
2076 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
2077 {
2078 #if HAVE_AT
2079 close (wd->fd);
2080 #endif
2081 free (wd);
2082 }
2083}
2084
2085#if HAVE_AT
2086
2087/* they forgot these */
2088
2089static int
2090eio__truncateat (int dirfd, const char *path, off_t length)
2091{
2092 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
2093 int res;
2094
2095 if (fd < 0)
2096 return fd;
2097
2098 res = ftruncate (fd, length);
2099 close (fd);
2100 return res;
2101}
2102
2103static int
2104eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
2105{
2106 int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC);
2107 int res;
2108
2109 if (fd < 0)
2110 return fd;
2111
2112 res = fstatvfs (fd, buf);
2113 close (fd);
2114 return res;
2115
2116}
2117
2118#endif
1933 2119
1934/*****************************************************************************/ 2120/*****************************************************************************/
1935 2121
1936#define ALLOC(len) \ 2122#define ALLOC(len) \
1937 if (!req->ptr2) \ 2123 if (!req->ptr2) \
1946 req->result = -1; \ 2132 req->result = -1; \
1947 break; \ 2133 break; \
1948 } \ 2134 } \
1949 } 2135 }
1950 2136
2137static void ecb_noinline ecb_cold
2138etp_proc_init (void)
2139{
2140#if HAVE_PRCTL_SET_NAME
2141 /* provide a more sensible "thread name" */
2142 char name[16 + 1];
2143 const int namelen = sizeof (name) - 1;
2144 int len;
2145
2146 prctl (PR_GET_NAME, (unsigned long)name, 0, 0, 0);
2147 name [namelen] = 0;
2148 len = strlen (name);
2149 strcpy (name + (len <= namelen - 4 ? len : namelen - 4), "/eio");
2150 prctl (PR_SET_NAME, (unsigned long)name, 0, 0, 0);
2151#endif
2152}
2153
1951X_THREAD_PROC (etp_proc) 2154X_THREAD_PROC (etp_proc)
1952{ 2155{
1953 ETP_REQ *req; 2156 ETP_REQ *req;
1954 struct timespec ts; 2157 struct timespec ts;
1955 etp_worker *self = (etp_worker *)thr_arg; 2158 etp_worker *self = (etp_worker *)thr_arg;
1956 2159
1957#if HAVE_PRCTL_SET_NAME 2160 etp_proc_init ();
1958 prctl (PR_SET_NAME, (unsigned long)"eio_thread", 0, 0, 0);
1959#endif
1960 2161
1961 /* try to distribute timeouts somewhat evenly */ 2162 /* try to distribute timeouts somewhat evenly */
1962 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 2163 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1963 2164
1964 for (;;) 2165 for (;;)
1967 2168
1968 X_LOCK (reqlock); 2169 X_LOCK (reqlock);
1969 2170
1970 for (;;) 2171 for (;;)
1971 { 2172 {
1972 self->req = req = reqq_shift (&req_queue); 2173 req = reqq_shift (&req_queue);
1973 2174
1974 if (req) 2175 if (req)
1975 break; 2176 break;
1976 2177
1977 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */ 2178 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
2015 ++npending; 2216 ++npending;
2016 2217
2017 if (!reqq_push (&res_queue, req) && want_poll_cb) 2218 if (!reqq_push (&res_queue, req) && want_poll_cb)
2018 want_poll_cb (); 2219 want_poll_cb ();
2019 2220
2020 self->req = 0;
2021 etp_worker_clear (self); 2221 etp_worker_clear (self);
2022 2222
2023 X_UNLOCK (reslock); 2223 X_UNLOCK (reslock);
2024 } 2224 }
2025 2225
2026quit: 2226quit:
2227 free (req);
2228
2027 X_LOCK (wrklock); 2229 X_LOCK (wrklock);
2028 etp_worker_free (self); 2230 etp_worker_free (self);
2029 X_UNLOCK (wrklock); 2231 X_UNLOCK (wrklock);
2030 2232
2031 return 0; 2233 return 0;
2074 } 2276 }
2075 2277
2076static void 2278static void
2077eio_execute (etp_worker *self, eio_req *req) 2279eio_execute (etp_worker *self, eio_req *req)
2078{ 2280{
2281#if HAVE_AT
2282 int dirfd;
2283#else
2284 const char *path;
2285#endif
2286
2079 if (ecb_expect_false (EIO_CANCELLED (req))) 2287 if (ecb_expect_false (EIO_CANCELLED (req)))
2080 { 2288 {
2081 req->result = -1; 2289 req->result = -1;
2082 req->errorno = ECANCELED; 2290 req->errorno = ECANCELED;
2083 return; 2291 return;
2084 } 2292 }
2085 2293
2294 if (ecb_expect_false (req->wd == EIO_INVALID_WD))
2295 {
2296 req->result = -1;
2297 req->errorno = ENOENT;
2298 return;
2299 }
2300
2301 if (req->type >= EIO_OPEN)
2302 {
2303 #if HAVE_AT
2304 dirfd = WD2FD (req->wd);
2305 #else
2306 path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
2307 #endif
2308 }
2309
2086 switch (req->type) 2310 switch (req->type)
2087 { 2311 {
2312 case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
2313 req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
2314 break;
2315 case EIO_WD_CLOSE: req->result = 0;
2316 eio_wd_close_sync (req->wd); break;
2317
2088 case EIO_READ: ALLOC (req->size); 2318 case EIO_READ: ALLOC (req->size);
2089 req->result = req->offs >= 0 2319 req->result = req->offs >= 0
2090 ? pread (req->int1, req->ptr2, req->size, req->offs) 2320 ? pread (req->int1, req->ptr2, req->size, req->offs)
2091 : read (req->int1, req->ptr2, req->size); break; 2321 : read (req->int1, req->ptr2, req->size); break;
2092 case EIO_WRITE: req->result = req->offs >= 0 2322 case EIO_WRITE: req->result = req->offs >= 0
2094 : write (req->int1, req->ptr2, req->size); break; 2324 : write (req->int1, req->ptr2, req->size); break;
2095 2325
2096 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 2326 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; 2327 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
2098 2328
2329#if HAVE_AT
2330
2099 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2331 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2100 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2332 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
2101 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2333 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2334 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
2335 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
2336 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
2337 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
2338 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
2339
2340 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
2341 case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
2342 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
2343 case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
2344 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
2345 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
2346 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2347 case EIO_READLINK: ALLOC (PATH_MAX);
2348 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
2349 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2350 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2351 case EIO_UTIME:
2352 case EIO_FUTIME:
2353 {
2354 struct timespec ts[2];
2355 struct timespec *times;
2356
2357 if (req->nv1 != -1. || req->nv2 != -1.)
2358 {
2359 ts[0].tv_sec = req->nv1;
2360 ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
2361 ts[1].tv_sec = req->nv2;
2362 ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
2363
2364 times = ts;
2365 }
2366 else
2367 times = 0;
2368
2369 req->result = req->type == EIO_FUTIME
2370 ? futimens (req->int1, times)
2371 : utimensat (dirfd, req->ptr1, times, 0);
2372 }
2373 break;
2374
2375#else
2376
2377 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2378 req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2379 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2102 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2380 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2381 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
2382 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
2383 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
2384 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
2385
2386 case EIO_UNLINK: req->result = unlink (path ); break;
2387 case EIO_RMDIR: req->result = rmdir (path ); break;
2388 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
2389 case EIO_RENAME: req->result = rename (path , req->ptr2); break;
2390 case EIO_LINK: req->result = link (path , req->ptr2); break;
2391 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
2392 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
2393 case EIO_READLINK: ALLOC (PATH_MAX);
2394 req->result = readlink (path, req->ptr2, PATH_MAX); break;
2395 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2396 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
2397
2398 case EIO_UTIME:
2399 case EIO_FUTIME:
2400 {
2401 struct timeval tv[2];
2402 struct timeval *times;
2403
2404 if (req->nv1 != -1. || req->nv2 != -1.)
2405 {
2406 tv[0].tv_sec = req->nv1;
2407 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
2408 tv[1].tv_sec = req->nv2;
2409 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
2410
2411 times = tv;
2412 }
2413 else
2414 times = 0;
2415
2416 req->result = req->type == EIO_FUTIME
2417 ? futimes (req->int1, times)
2418 : utimes (req->ptr1, times);
2419 }
2420 break;
2421
2422#endif
2423
2424 case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
2425 {
2426 ALLOC (req->result);
2427 memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
2428 }
2429 break;
2430
2103 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2431 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2104 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 2432 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
2105 2433
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)); 2434 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2109 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 2435 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2110 2436
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; 2437 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; 2438 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; 2439 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2117 2440
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; 2441 case EIO_CLOSE: req->result = close (req->int1); break;
2120 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 2442 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; 2443 case EIO_SYNC: req->result = 0; sync (); break;
2135 case EIO_FSYNC: req->result = fsync (req->int1); break; 2444 case EIO_FSYNC: req->result = fsync (req->int1); break;
2136 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2445 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2137 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break; 2446 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; 2447 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); 2466 req->result = select (0, 0, 0, 0, &tv);
2158 } 2467 }
2159#endif 2468#endif
2160 break; 2469 break;
2161 2470
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: 2471 case EIO_GROUP:
2187 abort (); /* handled in eio_request */ 2472 abort (); /* handled in eio_request */
2188 2473
2189 case EIO_NOP: 2474 case EIO_NOP:
2190 req->result = 0; 2475 req->result = 0;
2202 2487
2203 req->errorno = errno; 2488 req->errorno = errno;
2204} 2489}
2205 2490
2206#ifndef EIO_NO_WRAPPERS 2491#ifndef EIO_NO_WRAPPERS
2492
2493eio_req *eio_wd_open (const char *path, int pri, eio_cb cb, void *data)
2494{
2495 REQ (EIO_WD_OPEN); PATH; SEND;
2496}
2497
2498eio_req *eio_wd_close (eio_wd wd, int pri, eio_cb cb, void *data)
2499{
2500 REQ (EIO_WD_CLOSE); req->wd = wd; SEND;
2501}
2207 2502
2208eio_req *eio_nop (int pri, eio_cb cb, void *data) 2503eio_req *eio_nop (int pri, eio_cb cb, void *data)
2209{ 2504{
2210 REQ (EIO_NOP); SEND; 2505 REQ (EIO_NOP); SEND;
2211} 2506}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines