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

Comparing libeio/eio.c (file contents):
Revision 1.99 by root, Tue Jul 26 11:07:08 2011 UTC vs.
Revision 1.116 by root, Tue Mar 27 19:27:35 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>
105#ifdef _WIN32 105#ifdef _WIN32
106 106
107 #undef PAGESIZE 107 #undef PAGESIZE
108 #define PAGESIZE 4096 /* GetSystemInfo? */ 108 #define PAGESIZE 4096 /* GetSystemInfo? */
109 109
110 /* TODO: look at how perl does stat (non-sloppy), unlink (ro-files), utime, link */
111
110 #ifdef EIO_STRUCT_STATI64 112 #ifdef EIO_STRUCT_STATI64
113 /* look at perl's non-sloppy stat */
111 #define stat(path,buf) _stati64 (path,buf) 114 #define stat(path,buf) _stati64 (path,buf)
112 #define fstat(fd,buf) _fstati64 (fd,buf) 115 #define fstat(fd,buf) _fstati64 (fd,buf)
113 #endif 116 #endif
114 #define lstat(path,buf) stat (path,buf) 117 #define lstat(path,buf) stat (path,buf)
115 #define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1)) 118 #define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))
289#define FUBd \ 292#define FUBd \
290 free (eio_buf) 293 free (eio_buf)
291 294
292#define EIO_TICKS ((1000000 + 1023) >> 10) 295#define EIO_TICKS ((1000000 + 1023) >> 10)
293 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
294#define ETP_PRI_MIN EIO_PRI_MIN 341#define ETP_PRI_MIN EIO_PRI_MIN
295#define ETP_PRI_MAX EIO_PRI_MAX 342#define ETP_PRI_MAX EIO_PRI_MAX
296 343
297struct etp_worker; 344struct etp_worker;
298 345
321static void (*done_poll_cb) (void); 368static void (*done_poll_cb) (void);
322 369
323static unsigned int max_poll_time; /* reslock */ 370static unsigned int max_poll_time; /* reslock */
324static unsigned int max_poll_reqs; /* reslock */ 371static unsigned int max_poll_reqs; /* reslock */
325 372
326static volatile unsigned int nreqs; /* reqlock */ 373static unsigned int nreqs; /* reqlock */
327static volatile unsigned int nready; /* reqlock */ 374static unsigned int nready; /* reqlock */
328static volatile unsigned int npending; /* reqlock */ 375static unsigned int npending; /* reqlock */
329static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */ 376static unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
330static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */ 377static unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
331 378
332static xmutex_t wrklock; 379static xmutex_t wrklock;
333static xmutex_t reslock; 380static xmutex_t reslock;
334static xmutex_t reqlock; 381static xmutex_t reqlock;
335static xcond_t reqwait; 382static xcond_t reqwait;
343static xmutex_t preadwritelock; 390static xmutex_t preadwritelock;
344#endif 391#endif
345 392
346typedef struct etp_worker 393typedef struct etp_worker
347{ 394{
395 struct tmpbuf tmpbuf;
396
348 /* locked by wrklock */ 397 /* locked by wrklock */
349 struct etp_worker *prev, *next; 398 struct etp_worker *prev, *next;
350 399
351 xthread_t tid; 400 xthread_t tid;
352 401
353 /* locked by reslock, reqlock or wrklock */
354 ETP_REQ *req; /* currently processed request */
355
356#ifdef ETP_WORKER_COMMON 402#ifdef ETP_WORKER_COMMON
357 ETP_WORKER_COMMON 403 ETP_WORKER_COMMON
358#endif 404#endif
359} etp_worker; 405} etp_worker;
360 406
363#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 409#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
364#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) 410#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
365 411
366/* worker threads management */ 412/* worker threads management */
367 413
368static void ecb_cold 414static void
369etp_worker_clear (etp_worker *wrk) 415etp_worker_clear (etp_worker *wrk)
370{ 416{
371} 417}
372 418
373static void ecb_cold 419static void ecb_cold
374etp_worker_free (etp_worker *wrk) 420etp_worker_free (etp_worker *wrk)
375{ 421{
422 free (wrk->tmpbuf.ptr);
423
376 wrk->next->prev = wrk->prev; 424 wrk->next->prev = wrk->prev;
377 wrk->prev->next = wrk->next; 425 wrk->prev->next = wrk->next;
378 426
379 free (wrk); 427 free (wrk);
380} 428}
558} 606}
559 607
560static void ecb_cold 608static void ecb_cold
561etp_end_thread (void) 609etp_end_thread (void)
562{ 610{
563 eio_req *req = calloc (1, sizeof (eio_req)); 611 eio_req *req = calloc (1, sizeof (eio_req)); /* will be freed by worker */
564 612
565 req->type = -1; 613 req->type = -1;
566 req->pri = ETP_PRI_MAX - ETP_PRI_MIN; 614 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
567 615
568 X_LOCK (reqlock); 616 X_LOCK (reqlock);
1054 todo -= len; 1102 todo -= len;
1055 } 1103 }
1056 1104
1057 FUBd; 1105 FUBd;
1058 1106
1059 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 */
1060 return count; 1109 return 0;
1061} 1110}
1062 1111
1063#endif 1112#endif
1064 1113
1065/* sendfile always needs emulation */ 1114/* sendfile always needs emulation */
1334} 1383}
1335 1384
1336/*****************************************************************************/ 1385/*****************************************************************************/
1337/* requests implemented outside eio_execute, because they are so large */ 1386/* requests implemented outside eio_execute, because they are so large */
1338 1387
1388/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
1339static void 1389static int
1340eio__realpath (eio_req *req, etp_worker *self) 1390eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
1341{ 1391{
1342 char *rel = req->ptr1; 1392 const char *rel = path;
1343 char *res; 1393 char *res;
1344 char *tmp1, *tmp2; 1394 char *tmp1, *tmp2;
1345#if SYMLOOP_MAX > 32 1395#if SYMLOOP_MAX > 32
1346 int symlinks = SYMLOOP_MAX; 1396 int symlinks = SYMLOOP_MAX;
1347#else 1397#else
1348 int symlinks = 32; 1398 int symlinks = 32;
1349#endif 1399#endif
1350 1400
1351 req->result = -1;
1352
1353 errno = EINVAL; 1401 errno = EINVAL;
1354 if (!rel) 1402 if (!rel)
1355 return; 1403 return -1;
1356 1404
1357 errno = ENOENT; 1405 errno = ENOENT;
1358 if (!*rel) 1406 if (!*rel)
1359 return; 1407 return -1;
1360 1408
1361 if (!req->ptr2) 1409 res = tmpbuf_get (tmpbuf, PATH_MAX * 3);
1362 {
1363 X_LOCK (wrklock);
1364 req->flags |= EIO_FLAG_PTR2_FREE;
1365 X_UNLOCK (wrklock);
1366 req->ptr2 = malloc (PATH_MAX * 3);
1367
1368 errno = ENOMEM;
1369 if (!req->ptr2)
1370 return;
1371 }
1372
1373 res = req->ptr2;
1374 tmp1 = res + PATH_MAX; 1410 tmp1 = res + PATH_MAX;
1375 tmp2 = tmp1 + PATH_MAX; 1411 tmp2 = tmp1 + PATH_MAX;
1376 1412
1377#if 0 /* disabled, the musl way to do things is just too racy */ 1413#if 0 /* disabled, the musl way to do things is just too racy */
1378#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1414#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1397#endif 1433#endif
1398#endif 1434#endif
1399 1435
1400 if (*rel != '/') 1436 if (*rel != '/')
1401 { 1437 {
1438 int len;
1439
1440 errno = ENOENT;
1441 if (wd == EIO_INVALID_WD)
1442 return -1;
1443
1444 if (wd == EIO_CWD)
1445 {
1402 if (!getcwd (res, PATH_MAX)) 1446 if (!getcwd (res, PATH_MAX))
1403 return; 1447 return -1;
1448
1449 len = strlen (res);
1450 }
1451 else
1452 memcpy (res, wd->str, len = wd->len);
1404 1453
1405 if (res [1]) /* only use if not / */ 1454 if (res [1]) /* only use if not / */
1406 res += strlen (res); 1455 res += len;
1407 } 1456 }
1408 1457
1409 while (*rel) 1458 while (*rel)
1410 { 1459 {
1411 eio_ssize_t len, linklen; 1460 eio_ssize_t len, linklen;
1412 char *beg = rel; 1461 const char *beg = rel;
1413 1462
1414 while (*rel && *rel != '/') 1463 while (*rel && *rel != '/')
1415 ++rel; 1464 ++rel;
1416 1465
1417 len = rel - beg; 1466 len = rel - beg;
1429 1478
1430 if (beg [1] == '.' && len == 2) 1479 if (beg [1] == '.' && len == 2)
1431 { 1480 {
1432 /* .. - back up one component, if possible */ 1481 /* .. - back up one component, if possible */
1433 1482
1434 while (res != req->ptr2) 1483 while (res != tmpbuf->ptr)
1435 if (*--res == '/') 1484 if (*--res == '/')
1436 break; 1485 break;
1437 1486
1438 continue; 1487 continue;
1439 } 1488 }
1440 } 1489 }
1441 1490
1442 errno = ENAMETOOLONG; 1491 errno = ENAMETOOLONG;
1443 if (res + 1 + len + 1 >= tmp1) 1492 if (res + 1 + len + 1 >= tmp1)
1444 return; 1493 return -1;
1445 1494
1446 /* copy one component */ 1495 /* copy one component */
1447 *res = '/'; 1496 *res = '/';
1448 memcpy (res + 1, beg, len); 1497 memcpy (res + 1, beg, len);
1449 1498
1450 /* zero-terminate, for readlink */ 1499 /* zero-terminate, for readlink */
1451 res [len + 1] = 0; 1500 res [len + 1] = 0;
1452 1501
1453 /* now check if it's a symlink */ 1502 /* now check if it's a symlink */
1454 linklen = readlink (req->ptr2, tmp1, PATH_MAX); 1503 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1455 1504
1456 if (linklen < 0) 1505 if (linklen < 0)
1457 { 1506 {
1458 if (errno != EINVAL) 1507 if (errno != EINVAL)
1459 return; 1508 return -1;
1460 1509
1461 /* it's a normal directory. hopefully */ 1510 /* it's a normal directory. hopefully */
1462 res += len + 1; 1511 res += len + 1;
1463 } 1512 }
1464 else 1513 else
1466 /* yay, it was a symlink - build new path in tmp2 */ 1515 /* yay, it was a symlink - build new path in tmp2 */
1467 int rellen = strlen (rel); 1516 int rellen = strlen (rel);
1468 1517
1469 errno = ENAMETOOLONG; 1518 errno = ENAMETOOLONG;
1470 if (linklen + 1 + rellen >= PATH_MAX) 1519 if (linklen + 1 + rellen >= PATH_MAX)
1471 return; 1520 return -1;
1472 1521
1473 errno = ELOOP; 1522 errno = ELOOP;
1474 if (!--symlinks) 1523 if (!--symlinks)
1475 return; 1524 return -1;
1476 1525
1477 if (*tmp1 == '/') 1526 if (*tmp1 == '/')
1478 res = req->ptr2; /* symlink resolves to an absolute path */ 1527 res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1479 1528
1480 /* we need to be careful, as rel might point into tmp2 already */ 1529 /* we need to be careful, as rel might point into tmp2 already */
1481 memmove (tmp2 + linklen + 1, rel, rellen + 1); 1530 memmove (tmp2 + linklen + 1, rel, rellen + 1);
1482 tmp2 [linklen] = '/'; 1531 tmp2 [linklen] = '/';
1483 memcpy (tmp2, tmp1, linklen); 1532 memcpy (tmp2, tmp1, linklen);
1485 rel = tmp2; 1534 rel = tmp2;
1486 } 1535 }
1487 } 1536 }
1488 1537
1489 /* special case for the lone root path */ 1538 /* special case for the lone root path */
1490 if (res == req->ptr2) 1539 if (res == tmpbuf->ptr)
1491 *res++ = '/'; 1540 *res++ = '/';
1492 1541
1493 req->result = res - (char *)req->ptr2; 1542 return res - (char *)tmpbuf->ptr;
1494
1495done:
1496 req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1497} 1543}
1498 1544
1499static signed char 1545static signed char
1500eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1546eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1501{ 1547{
1689#ifdef _WIN32 1735#ifdef _WIN32
1690 { 1736 {
1691 int len = strlen ((const char *)req->ptr1); 1737 int len = strlen ((const char *)req->ptr1);
1692 char *path = malloc (MAX_PATH); 1738 char *path = malloc (MAX_PATH);
1693 const char *fmt; 1739 const char *fmt;
1740 const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1694 1741
1695 if (!len) 1742 if (!len)
1696 fmt = "./*"; 1743 fmt = "./*";
1697 else if (((const char *)req->ptr1)[len - 1] == '/' || ((const char *)req->ptr1)[len - 1] == '\\') 1744 else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1698 fmt = "%s*"; 1745 fmt = "%s*";
1699 else 1746 else
1700 fmt = "%s/*"; 1747 fmt = "%s/*";
1701 1748
1702 _snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1); 1749 _snprintf (path, MAX_PATH, fmt, reqpath);
1703 dirp = FindFirstFile (path, &entp); 1750 dirp = FindFirstFile (path, &entp);
1704 free (path); 1751 free (path);
1705 1752
1706 if (dirp == INVALID_HANDLE_VALUE) 1753 if (dirp == INVALID_HANDLE_VALUE)
1707 { 1754 {
1708 dirp = 0;
1709
1710 /* should steal _dosmaperr */ 1755 /* should steal _dosmaperr */
1711 switch (GetLastError ()) 1756 switch (GetLastError ())
1712 { 1757 {
1713 case ERROR_FILE_NOT_FOUND: 1758 case ERROR_FILE_NOT_FOUND:
1714 req->result = 0; 1759 req->result = 0;
1715 break; 1760 break;
1716 1761
1717 case ERROR_INVALID_NAME: 1762 case ERROR_INVALID_NAME:
1718 case ERROR_PATH_NOT_FOUND: 1763 case ERROR_PATH_NOT_FOUND:
1719 case ERROR_NO_MORE_FILES: 1764 case ERROR_NO_MORE_FILES:
1720 errno = ENOENT; 1765 errno = ENOENT;
1721 break; 1766 break;
1722 1767
1723 case ERROR_NOT_ENOUGH_MEMORY: 1768 case ERROR_NOT_ENOUGH_MEMORY:
1724 errno = ENOMEM; 1769 errno = ENOMEM;
1725 break; 1770 break;
1726 1771
1727 default: 1772 default:
1728 errno = EINVAL; 1773 errno = EINVAL;
1729 break; 1774 break;
1730 } 1775 }
1776
1777 return;
1731 } 1778 }
1732 } 1779 }
1733#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
1734 dirp = opendir (req->ptr1); 1795 dirp = opendir (req->ptr1);
1796 #else
1797 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
1798 #endif
1799
1800 if (!dirp)
1801 return;
1735#endif 1802#endif
1736 1803
1737 if (req->flags & EIO_FLAG_PTR1_FREE) 1804 if (req->flags & EIO_FLAG_PTR1_FREE)
1738 free (req->ptr1); 1805 free (req->ptr1);
1739 1806
1740 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1807 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1741 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1808 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1742 req->ptr2 = names = malloc (namesalloc); 1809 req->ptr2 = names = malloc (namesalloc);
1743 1810
1744 if (dirp && names && (!flags || dents)) 1811 if (!names || (flags && !dents))
1812 return;
1813
1745 for (;;) 1814 for (;;)
1746 { 1815 {
1747 int done; 1816 int done;
1748 1817
1749#ifdef _WIN32 1818#ifdef _WIN32
1750 done = !dirp; 1819 done = !dirp;
1751#else 1820#else
1752 errno = 0; 1821 errno = 0;
1753 entp = readdir (dirp); 1822 entp = readdir (dirp);
1754 done = !entp; 1823 done = !entp;
1755#endif 1824#endif
1756 1825
1757 if (done) 1826 if (done)
1758 { 1827 {
1759#ifndef _WIN32 1828#ifndef _WIN32
1760 int old_errno = errno; 1829 int old_errno = errno;
1761 closedir (dirp); 1830 closedir (dirp);
1762 errno = old_errno; 1831 errno = old_errno;
1763 1832
1764 if (errno) 1833 if (errno)
1765 break; 1834 break;
1766#endif 1835#endif
1767 1836
1768 /* sort etc. */ 1837 /* sort etc. */
1769 req->int1 = flags; 1838 req->int1 = flags;
1770 req->result = dentoffs; 1839 req->result = dentoffs;
1771 1840
1772 if (flags & EIO_READDIR_STAT_ORDER) 1841 if (flags & EIO_READDIR_STAT_ORDER)
1773 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits); 1842 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1774 else if (flags & EIO_READDIR_DIRS_FIRST) 1843 else if (flags & EIO_READDIR_DIRS_FIRST)
1775 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1844 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1776 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */ 1845 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1777 else 1846 else
1847 {
1848 /* in this case, all is known, and we just put dirs first and sort them */
1849 eio_dirent *oth = dents + dentoffs;
1850 eio_dirent *dir = dents;
1851
1852 /* now partition dirs to the front, and non-dirs to the back */
1853 /* by walking from both sides and swapping if necessary */
1854 while (oth > dir)
1855 {
1856 if (dir->type == EIO_DT_DIR)
1857 ++dir;
1858 else if ((--oth)->type == EIO_DT_DIR)
1859 {
1860 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1861
1862 ++dir;
1863 }
1864 }
1865
1866 /* now sort the dirs only (dirs all have the same score) */
1867 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1868 }
1869
1870 break;
1871 }
1872
1873 /* now add the entry to our list(s) */
1874 name = D_NAME (entp);
1875
1876 /* skip . and .. entries */
1877 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1878 {
1879 int len = D_NAMLEN (entp) + 1;
1880
1881 while (ecb_expect_false (namesoffs + len > namesalloc))
1882 {
1883 namesalloc *= 2;
1884 req->ptr2 = names = realloc (names, namesalloc);
1885
1886 if (!names)
1887 break;
1888 }
1889
1890 memcpy (names + namesoffs, name, len);
1891
1892 if (dents)
1893 {
1894 struct eio_dirent *ent;
1895
1896 if (ecb_expect_false (dentoffs == dentalloc))
1778 { 1897 {
1779 /* in this case, all is known, and we just put dirs first and sort them */ 1898 dentalloc *= 2;
1899 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1900
1901 if (!dents)
1902 break;
1903 }
1904
1780 eio_dirent *oth = dents + dentoffs; 1905 ent = dents + dentoffs;
1781 eio_dirent *dir = dents;
1782 1906
1783 /* now partition dirs to the front, and non-dirs to the back */ 1907 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1784 /* by walking from both sides and swapping if necessary */ 1908 ent->namelen = len - 1;
1785 while (oth > dir) 1909 ent->inode = D_INO (entp);
1910
1911 inode_bits |= ent->inode;
1912
1913 switch (D_TYPE (entp))
1914 {
1915 default:
1916 ent->type = EIO_DT_UNKNOWN;
1917 flags |= EIO_READDIR_FOUND_UNKNOWN;
1918 break;
1919
1920 #ifdef DT_FIFO
1921 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1922 #endif
1923 #ifdef DT_CHR
1924 case DT_CHR: ent->type = EIO_DT_CHR; break;
1925 #endif
1926 #ifdef DT_MPC
1927 case DT_MPC: ent->type = EIO_DT_MPC; break;
1928 #endif
1929 #ifdef DT_DIR
1930 case DT_DIR: ent->type = EIO_DT_DIR; break;
1931 #endif
1932 #ifdef DT_NAM
1933 case DT_NAM: ent->type = EIO_DT_NAM; break;
1934 #endif
1935 #ifdef DT_BLK
1936 case DT_BLK: ent->type = EIO_DT_BLK; break;
1937 #endif
1938 #ifdef DT_MPB
1939 case DT_MPB: ent->type = EIO_DT_MPB; break;
1940 #endif
1941 #ifdef DT_REG
1942 case DT_REG: ent->type = EIO_DT_REG; break;
1943 #endif
1944 #ifdef DT_NWK
1945 case DT_NWK: ent->type = EIO_DT_NWK; break;
1946 #endif
1947 #ifdef DT_CMP
1948 case DT_CMP: ent->type = EIO_DT_CMP; break;
1949 #endif
1950 #ifdef DT_LNK
1951 case DT_LNK: ent->type = EIO_DT_LNK; break;
1952 #endif
1953 #ifdef DT_SOCK
1954 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1955 #endif
1956 #ifdef DT_DOOR
1957 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1958 #endif
1959 #ifdef DT_WHT
1960 case DT_WHT: ent->type = EIO_DT_WHT; break;
1961 #endif
1962 }
1963
1964 ent->score = 7;
1965
1966 if (flags & EIO_READDIR_DIRS_FIRST)
1967 {
1968 if (ent->type == EIO_DT_UNKNOWN)
1786 { 1969 {
1787 if (dir->type == EIO_DT_DIR) 1970 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1788 ++dir; 1971 ent->score = 1;
1789 else if ((--oth)->type == EIO_DT_DIR) 1972 else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1790 { 1973 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1791 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1792
1793 ++dir;
1794 }
1795 } 1974 }
1796 1975 else if (ent->type == EIO_DT_DIR)
1797 /* now sort the dirs only (dirs all have the same score) */ 1976 ent->score = 0;
1798 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1799 } 1977 }
1800
1801 break;
1802 }
1803
1804 /* now add the entry to our list(s) */
1805 name = D_NAME (entp);
1806
1807 /* skip . and .. entries */
1808 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1809 {
1810 int len = D_NAMLEN (entp) + 1;
1811
1812 while (ecb_expect_false (namesoffs + len > namesalloc))
1813 {
1814 namesalloc *= 2;
1815 req->ptr2 = names = realloc (names, namesalloc);
1816
1817 if (!names)
1818 break;
1819 } 1978 }
1820 1979
1821 memcpy (names + namesoffs, name, len);
1822
1823 if (dents)
1824 {
1825 struct eio_dirent *ent;
1826
1827 if (ecb_expect_false (dentoffs == dentalloc))
1828 {
1829 dentalloc *= 2;
1830 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1831
1832 if (!dents)
1833 break;
1834 }
1835
1836 ent = dents + dentoffs;
1837
1838 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1839 ent->namelen = len - 1;
1840 ent->inode = D_INO (entp);
1841
1842 inode_bits |= ent->inode;
1843
1844 switch (D_TYPE (entp))
1845 {
1846 default:
1847 ent->type = EIO_DT_UNKNOWN;
1848 flags |= EIO_READDIR_FOUND_UNKNOWN;
1849 break;
1850
1851 #ifdef DT_FIFO
1852 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1853 #endif
1854 #ifdef DT_CHR
1855 case DT_CHR: ent->type = EIO_DT_CHR; break;
1856 #endif
1857 #ifdef DT_MPC
1858 case DT_MPC: ent->type = EIO_DT_MPC; break;
1859 #endif
1860 #ifdef DT_DIR
1861 case DT_DIR: ent->type = EIO_DT_DIR; break;
1862 #endif
1863 #ifdef DT_NAM
1864 case DT_NAM: ent->type = EIO_DT_NAM; break;
1865 #endif
1866 #ifdef DT_BLK
1867 case DT_BLK: ent->type = EIO_DT_BLK; break;
1868 #endif
1869 #ifdef DT_MPB
1870 case DT_MPB: ent->type = EIO_DT_MPB; break;
1871 #endif
1872 #ifdef DT_REG
1873 case DT_REG: ent->type = EIO_DT_REG; break;
1874 #endif
1875 #ifdef DT_NWK
1876 case DT_NWK: ent->type = EIO_DT_NWK; break;
1877 #endif
1878 #ifdef DT_CMP
1879 case DT_CMP: ent->type = EIO_DT_CMP; break;
1880 #endif
1881 #ifdef DT_LNK
1882 case DT_LNK: ent->type = EIO_DT_LNK; break;
1883 #endif
1884 #ifdef DT_SOCK
1885 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1886 #endif
1887 #ifdef DT_DOOR
1888 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1889 #endif
1890 #ifdef DT_WHT
1891 case DT_WHT: ent->type = EIO_DT_WHT; break;
1892 #endif
1893 }
1894
1895 ent->score = 7;
1896
1897 if (flags & EIO_READDIR_DIRS_FIRST)
1898 {
1899 if (ent->type == EIO_DT_UNKNOWN)
1900 {
1901 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1902 ent->score = 1;
1903 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1904 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1905 }
1906 else if (ent->type == EIO_DT_DIR)
1907 ent->score = 0;
1908 }
1909 }
1910
1911 namesoffs += len; 1980 namesoffs += len;
1912 ++dentoffs; 1981 ++dentoffs;
1913 } 1982 }
1914 1983
1915 if (EIO_CANCELLED (req)) 1984 if (EIO_CANCELLED (req))
1916 { 1985 {
1917 errno = ECANCELED; 1986 errno = ECANCELED;
1918 break; 1987 break;
1919 } 1988 }
1920 1989
1921#ifdef _WIN32 1990#ifdef _WIN32
1922 if (!FindNextFile (dirp, &entp)) 1991 if (!FindNextFile (dirp, &entp))
1923 { 1992 {
1924 FindClose (dirp); 1993 FindClose (dirp);
1925 dirp = 0; 1994 dirp = 0;
1926 } 1995 }
1927#endif 1996#endif
1928 } 1997 }
1929} 1998}
1999
2000/*****************************************************************************/
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;
2044
2045#if HAVE_AT
2046 fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
2047
2048 if (fd < 0)
2049 return EIO_INVALID_WD;
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}
2064
2065eio_wd
2066eio_wd_open_sync (eio_wd wd, const char *path)
2067{
2068 struct tmpbuf tmpbuf = { 0 };
2069 wd = eio__wd_open_sync (&tmpbuf, wd, path);
2070 free (tmpbuf.ptr);
2071
2072 return wd;
2073}
2074
2075void
2076eio_wd_close_sync (eio_wd wd)
2077{
2078 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
2079 {
2080 #if HAVE_AT
2081 close (wd->fd);
2082 #endif
2083 free (wd);
2084 }
2085}
2086
2087#if HAVE_AT
2088
2089/* they forgot these */
2090
2091static int
2092eio__truncateat (int dirfd, const char *path, off_t length)
2093{
2094 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
2095 int res;
2096
2097 if (fd < 0)
2098 return fd;
2099
2100 res = ftruncate (fd, length);
2101 close (fd);
2102 return res;
2103}
2104
2105static int
2106eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
2107{
2108 int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC);
2109 int res;
2110
2111 if (fd < 0)
2112 return fd;
2113
2114 res = fstatvfs (fd, buf);
2115 close (fd);
2116 return res;
2117
2118}
2119
2120#endif
1930 2121
1931/*****************************************************************************/ 2122/*****************************************************************************/
1932 2123
1933#define ALLOC(len) \ 2124#define ALLOC(len) \
1934 if (!req->ptr2) \ 2125 if (!req->ptr2) \
1943 req->result = -1; \ 2134 req->result = -1; \
1944 break; \ 2135 break; \
1945 } \ 2136 } \
1946 } 2137 }
1947 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
1948X_THREAD_PROC (etp_proc) 2156X_THREAD_PROC (etp_proc)
1949{ 2157{
1950 ETP_REQ *req; 2158 ETP_REQ *req;
1951 struct timespec ts; 2159 struct timespec ts;
1952 etp_worker *self = (etp_worker *)thr_arg; 2160 etp_worker *self = (etp_worker *)thr_arg;
1953 2161
1954#if HAVE_PRCTL_SET_NAME 2162 etp_proc_init ();
1955 prctl (PR_SET_NAME, (unsigned long)"eio_thread", 0, 0, 0);
1956#endif
1957 2163
1958 /* try to distribute timeouts somewhat evenly */ 2164 /* try to distribute timeouts somewhat evenly */
1959 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 2165 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1960 2166
1961 for (;;) 2167 for (;;)
1964 2170
1965 X_LOCK (reqlock); 2171 X_LOCK (reqlock);
1966 2172
1967 for (;;) 2173 for (;;)
1968 { 2174 {
1969 self->req = req = reqq_shift (&req_queue); 2175 req = reqq_shift (&req_queue);
1970 2176
1971 if (req) 2177 if (req)
1972 break; 2178 break;
1973 2179
1974 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */ 2180 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
2012 ++npending; 2218 ++npending;
2013 2219
2014 if (!reqq_push (&res_queue, req) && want_poll_cb) 2220 if (!reqq_push (&res_queue, req) && want_poll_cb)
2015 want_poll_cb (); 2221 want_poll_cb ();
2016 2222
2017 self->req = 0;
2018 etp_worker_clear (self); 2223 etp_worker_clear (self);
2019 2224
2020 X_UNLOCK (reslock); 2225 X_UNLOCK (reslock);
2021 } 2226 }
2022 2227
2023quit: 2228quit:
2229 free (req);
2230
2024 X_LOCK (wrklock); 2231 X_LOCK (wrklock);
2025 etp_worker_free (self); 2232 etp_worker_free (self);
2026 X_UNLOCK (wrklock); 2233 X_UNLOCK (wrklock);
2027 2234
2028 return 0; 2235 return 0;
2071 } 2278 }
2072 2279
2073static void 2280static void
2074eio_execute (etp_worker *self, eio_req *req) 2281eio_execute (etp_worker *self, eio_req *req)
2075{ 2282{
2283#if HAVE_AT
2284 int dirfd;
2285#else
2286 const char *path;
2287#endif
2288
2076 if (ecb_expect_false (EIO_CANCELLED (req))) 2289 if (ecb_expect_false (EIO_CANCELLED (req)))
2077 { 2290 {
2078 req->result = -1; 2291 req->result = -1;
2079 req->errorno = ECANCELED; 2292 req->errorno = ECANCELED;
2080 return; 2293 return;
2081 } 2294 }
2082 2295
2296 if (ecb_expect_false (req->wd == EIO_INVALID_WD))
2297 {
2298 req->result = -1;
2299 req->errorno = ENOENT;
2300 return;
2301 }
2302
2303 if (req->type >= EIO_OPEN)
2304 {
2305 #if HAVE_AT
2306 dirfd = WD2FD (req->wd);
2307 #else
2308 path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
2309 #endif
2310 }
2311
2083 switch (req->type) 2312 switch (req->type)
2084 { 2313 {
2314 case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
2315 req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
2316 break;
2317 case EIO_WD_CLOSE: req->result = 0;
2318 eio_wd_close_sync (req->wd); break;
2319
2085 case EIO_READ: ALLOC (req->size); 2320 case EIO_READ: ALLOC (req->size);
2086 req->result = req->offs >= 0 2321 req->result = req->offs >= 0
2087 ? pread (req->int1, req->ptr2, req->size, req->offs) 2322 ? pread (req->int1, req->ptr2, req->size, req->offs)
2088 : read (req->int1, req->ptr2, req->size); break; 2323 : read (req->int1, req->ptr2, req->size); break;
2089 case EIO_WRITE: req->result = req->offs >= 0 2324 case EIO_WRITE: req->result = req->offs >= 0
2091 : write (req->int1, req->ptr2, req->size); break; 2326 : write (req->int1, req->ptr2, req->size); break;
2092 2327
2093 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 2328 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
2094 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break; 2329 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
2095 2330
2331#if HAVE_AT
2332
2096 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2333 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2097 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2334 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
2098 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2335 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2336 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
2337 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
2338 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
2339 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
2340 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
2341
2342 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
2343 case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
2344 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
2345 case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
2346 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
2347 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
2348 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2349 case EIO_READLINK: ALLOC (PATH_MAX);
2350 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
2351 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2352 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2353 case EIO_UTIME:
2354 case EIO_FUTIME:
2355 {
2356 struct timespec ts[2];
2357 struct timespec *times;
2358
2359 if (req->nv1 != -1. || req->nv2 != -1.)
2360 {
2361 ts[0].tv_sec = req->nv1;
2362 ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
2363 ts[1].tv_sec = req->nv2;
2364 ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
2365
2366 times = ts;
2367 }
2368 else
2369 times = 0;
2370
2371 req->result = req->type == EIO_FUTIME
2372 ? futimens (req->int1, times)
2373 : utimensat (dirfd, req->ptr1, times, 0);
2374 }
2375 break;
2376
2377#else
2378
2379 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2380 req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2381 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2099 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2382 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2383 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
2384 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
2385 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
2386 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
2387
2388 case EIO_UNLINK: req->result = unlink (path ); break;
2389 case EIO_RMDIR: req->result = rmdir (path ); break;
2390 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
2391 case EIO_RENAME: req->result = rename (path , req->ptr2); break;
2392 case EIO_LINK: req->result = link (path , req->ptr2); break;
2393 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
2394 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
2395 case EIO_READLINK: ALLOC (PATH_MAX);
2396 req->result = readlink (path, req->ptr2, PATH_MAX); break;
2397 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2398 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
2399
2400 case EIO_UTIME:
2401 case EIO_FUTIME:
2402 {
2403 struct timeval tv[2];
2404 struct timeval *times;
2405
2406 if (req->nv1 != -1. || req->nv2 != -1.)
2407 {
2408 tv[0].tv_sec = req->nv1;
2409 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
2410 tv[1].tv_sec = req->nv2;
2411 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
2412
2413 times = tv;
2414 }
2415 else
2416 times = 0;
2417
2418 req->result = req->type == EIO_FUTIME
2419 ? futimes (req->int1, times)
2420 : utimes (req->ptr1, times);
2421 }
2422 break;
2423
2424#endif
2425
2426 case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
2427 {
2428 ALLOC (req->result);
2429 memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
2430 }
2431 break;
2432
2100 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2433 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2101 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 2434 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
2102 2435
2103 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2104 req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2105 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 2436 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2106 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 2437 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2107 2438
2108 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
2109 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break; 2439 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
2110 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
2111 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break; 2440 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
2112 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
2113 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break; 2441 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2114 2442
2115 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
2116 case EIO_CLOSE: req->result = close (req->int1); break; 2443 case EIO_CLOSE: req->result = close (req->int1); break;
2117 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 2444 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
2118 case EIO_UNLINK: req->result = unlink (req->ptr1); break;
2119 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
2120 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
2121 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
2122 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
2123 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
2124 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2125
2126 case EIO_REALPATH: eio__realpath (req, self); break;
2127
2128 case EIO_READLINK: ALLOC (PATH_MAX);
2129 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
2130
2131 case EIO_SYNC: req->result = 0; sync (); break; 2445 case EIO_SYNC: req->result = 0; sync (); break;
2132 case EIO_FSYNC: req->result = fsync (req->int1); break; 2446 case EIO_FSYNC: req->result = fsync (req->int1); break;
2133 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2447 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2134 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break; 2448 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
2135 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break; 2449 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2154 req->result = select (0, 0, 0, 0, &tv); 2468 req->result = select (0, 0, 0, 0, &tv);
2155 } 2469 }
2156#endif 2470#endif
2157 break; 2471 break;
2158 2472
2159 case EIO_UTIME:
2160 case EIO_FUTIME:
2161 {
2162 struct timeval tv[2];
2163 struct timeval *times;
2164
2165 if (req->nv1 != -1. || req->nv2 != -1.)
2166 {
2167 tv[0].tv_sec = req->nv1;
2168 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
2169 tv[1].tv_sec = req->nv2;
2170 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
2171
2172 times = tv;
2173 }
2174 else
2175 times = 0;
2176
2177 req->result = req->type == EIO_FUTIME
2178 ? futimes (req->int1, times)
2179 : utimes (req->ptr1, times);
2180 }
2181 break;
2182
2183 case EIO_GROUP: 2473 case EIO_GROUP:
2184 abort (); /* handled in eio_request */ 2474 abort (); /* handled in eio_request */
2185 2475
2186 case EIO_NOP: 2476 case EIO_NOP:
2187 req->result = 0; 2477 req->result = 0;
2199 2489
2200 req->errorno = errno; 2490 req->errorno = errno;
2201} 2491}
2202 2492
2203#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}
2204 2504
2205eio_req *eio_nop (int pri, eio_cb cb, void *data) 2505eio_req *eio_nop (int pri, eio_cb cb, void *data)
2206{ 2506{
2207 REQ (EIO_NOP); SEND; 2507 REQ (EIO_NOP); SEND;
2208} 2508}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines