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

Comparing libeio/eio.c (file contents):
Revision 1.98 by root, Sun Jul 24 05:53:34 2011 UTC vs.
Revision 1.106 by root, Mon Sep 26 20:19:08 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>
58#include <sys/stat.h> 58#include <sys/stat.h>
59#include <limits.h> 59#include <limits.h>
60#include <fcntl.h> 60#include <fcntl.h>
61#include <assert.h> 61#include <assert.h>
62 62
63#if _POSIX_VERSION >= 200809L
64# define HAVE_AT 1
65#else
66# define HAVE_AT 0
67#endif
68
63/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */ 69/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */
64/* intptr_t only comes from stdint.h, says idiot openbsd coder */ 70/* intptr_t only comes from stdint.h, says idiot openbsd coder */
65#if HAVE_STDINT_H 71#if HAVE_STDINT_H
66# include <stdint.h> 72# include <stdint.h>
67#endif 73#endif
105#ifdef _WIN32 111#ifdef _WIN32
106 112
107 #undef PAGESIZE 113 #undef PAGESIZE
108 #define PAGESIZE 4096 /* GetSystemInfo? */ 114 #define PAGESIZE 4096 /* GetSystemInfo? */
109 115
116 /* TODO: look at how perl does stat (non-sloppy), unlink (ro-files), utime, link */
117
110 #ifdef EIO_STRUCT_STATI64 118 #ifdef EIO_STRUCT_STATI64
119 /* look at perl's non-sloppy stat */
111 #define stat(path,buf) _stati64 (path,buf) 120 #define stat(path,buf) _stati64 (path,buf)
112 #define fstat(fd,buf) _fstati64 (fd,buf) 121 #define fstat(fd,buf) _fstati64 (fd,buf)
113 #endif 122 #endif
114 #define lstat(path,buf) stat (path,buf) 123 #define lstat(path,buf) stat (path,buf)
115 #define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1)) 124 #define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))
128 #define mknod(path,mode,dev) EIO_ENOSYS () 137 #define mknod(path,mode,dev) EIO_ENOSYS ()
129 #define sync() EIO_ENOSYS () 138 #define sync() EIO_ENOSYS ()
130 #define readlink(path,buf,s) EIO_ENOSYS () 139 #define readlink(path,buf,s) EIO_ENOSYS ()
131 #define statvfs(path,buf) EIO_ENOSYS () 140 #define statvfs(path,buf) EIO_ENOSYS ()
132 #define fstatvfs(fd,buf) EIO_ENOSYS () 141 #define fstatvfs(fd,buf) EIO_ENOSYS ()
142
143 /* rename() uses MoveFile, which fails to overwrite */
144 #define rename(old,neu) eio__rename (old, neu)
145
146 static int
147 eio__rename (const char *old, const char *neu)
148 {
149 if (MoveFileEx (old, neu, MOVEFILE_REPLACE_EXISTING))
150 return 0;
151
152 /* should steal _dosmaperr */
153 switch (GetLastError ())
154 {
155 case ERROR_FILE_NOT_FOUND:
156 case ERROR_PATH_NOT_FOUND:
157 case ERROR_INVALID_DRIVE:
158 case ERROR_NO_MORE_FILES:
159 case ERROR_BAD_NETPATH:
160 case ERROR_BAD_NET_NAME:
161 case ERROR_BAD_PATHNAME:
162 case ERROR_FILENAME_EXCED_RANGE:
163 errno = ENOENT;
164 break;
165
166 default:
167 errno = EACCES;
168 break;
169 }
170
171 return -1;
172 }
133 173
134 /* we could even stat and see if it exists */ 174 /* we could even stat and see if it exists */
135 static int 175 static int
136 symlink (const char *old, const char *neu) 176 symlink (const char *old, const char *neu)
137 { 177 {
258#define FUBd \ 298#define FUBd \
259 free (eio_buf) 299 free (eio_buf)
260 300
261#define EIO_TICKS ((1000000 + 1023) >> 10) 301#define EIO_TICKS ((1000000 + 1023) >> 10)
262 302
303/*****************************************************************************/
304
305struct tmpbuf
306{
307 void *ptr;
308 int len;
309};
310
311static void *
312tmpbuf_get (struct tmpbuf *buf, int len)
313{
314 if (buf->len < len)
315 {
316 free (buf->ptr);
317 buf->ptr = malloc (buf->len = len);
318 }
319
320 return buf->ptr;
321}
322
323/*****************************************************************************/
324
263#define ETP_PRI_MIN EIO_PRI_MIN 325#define ETP_PRI_MIN EIO_PRI_MIN
264#define ETP_PRI_MAX EIO_PRI_MAX 326#define ETP_PRI_MAX EIO_PRI_MAX
265 327
266struct etp_worker; 328struct etp_worker;
267 329
290static void (*done_poll_cb) (void); 352static void (*done_poll_cb) (void);
291 353
292static unsigned int max_poll_time; /* reslock */ 354static unsigned int max_poll_time; /* reslock */
293static unsigned int max_poll_reqs; /* reslock */ 355static unsigned int max_poll_reqs; /* reslock */
294 356
295static volatile unsigned int nreqs; /* reqlock */ 357static unsigned int nreqs; /* reqlock */
296static volatile unsigned int nready; /* reqlock */ 358static unsigned int nready; /* reqlock */
297static volatile unsigned int npending; /* reqlock */ 359static unsigned int npending; /* reqlock */
298static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */ 360static unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
299static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */ 361static unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
300 362
301static xmutex_t wrklock; 363static xmutex_t wrklock;
302static xmutex_t reslock; 364static xmutex_t reslock;
303static xmutex_t reqlock; 365static xmutex_t reqlock;
304static xcond_t reqwait; 366static xcond_t reqwait;
312static xmutex_t preadwritelock; 374static xmutex_t preadwritelock;
313#endif 375#endif
314 376
315typedef struct etp_worker 377typedef struct etp_worker
316{ 378{
379 struct tmpbuf tmpbuf;
380
317 /* locked by wrklock */ 381 /* locked by wrklock */
318 struct etp_worker *prev, *next; 382 struct etp_worker *prev, *next;
319 383
320 xthread_t tid; 384 xthread_t tid;
321 385
322 /* locked by reslock, reqlock or wrklock */
323 ETP_REQ *req; /* currently processed request */
324
325#ifdef ETP_WORKER_COMMON 386#ifdef ETP_WORKER_COMMON
326 ETP_WORKER_COMMON 387 ETP_WORKER_COMMON
327#endif 388#endif
328} etp_worker; 389} etp_worker;
329 390
340} 401}
341 402
342static void ecb_cold 403static void ecb_cold
343etp_worker_free (etp_worker *wrk) 404etp_worker_free (etp_worker *wrk)
344{ 405{
406 free (wrk->tmpbuf.ptr);
407
345 wrk->next->prev = wrk->prev; 408 wrk->next->prev = wrk->prev;
346 wrk->prev->next = wrk->next; 409 wrk->prev->next = wrk->next;
347 410
348 free (wrk); 411 free (wrk);
349} 412}
527} 590}
528 591
529static void ecb_cold 592static void ecb_cold
530etp_end_thread (void) 593etp_end_thread (void)
531{ 594{
532 eio_req *req = calloc (1, sizeof (eio_req)); 595 eio_req *req = calloc (1, sizeof (eio_req)); /* will be freed by worker */
533 596
534 req->type = -1; 597 req->type = -1;
535 req->pri = ETP_PRI_MAX - ETP_PRI_MIN; 598 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
536 599
537 X_LOCK (reqlock); 600 X_LOCK (reqlock);
1303} 1366}
1304 1367
1305/*****************************************************************************/ 1368/*****************************************************************************/
1306/* requests implemented outside eio_execute, because they are so large */ 1369/* requests implemented outside eio_execute, because they are so large */
1307 1370
1371/* copies some absolute path to tmpbuf */
1372static char *
1373eio__getwd (struct tmpbuf *tmpbuf, eio_wd wd)
1374{
1375 if (wd == EIO_CWD)
1376 return getcwd (tmpbuf->ptr, PATH_MAX);
1377
1378#if HAVE_AT
1379 abort (); /*TODO*/
1380#else
1381 strcpy (tmpbuf->ptr, wd);
1382#endif
1383 return tmpbuf->ptr;
1384}
1385
1386/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
1308static void 1387static int
1309eio__realpath (eio_req *req, etp_worker *self) 1388eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
1310{ 1389{
1311 char *rel = req->ptr1; 1390 const char *rel = path;
1312 char *res; 1391 char *res;
1313 char *tmp1, *tmp2; 1392 char *tmp1, *tmp2;
1314#if SYMLOOP_MAX > 32 1393#if SYMLOOP_MAX > 32
1315 int symlinks = SYMLOOP_MAX; 1394 int symlinks = SYMLOOP_MAX;
1316#else 1395#else
1317 int symlinks = 32; 1396 int symlinks = 32;
1318#endif 1397#endif
1319 1398
1320 req->result = -1; 1399 /*D*/ /*TODO: wd ignored */
1321 1400
1322 errno = EINVAL; 1401 errno = EINVAL;
1323 if (!rel) 1402 if (!rel)
1324 return; 1403 return -1;
1325 1404
1326 errno = ENOENT; 1405 errno = ENOENT;
1327 if (!*rel) 1406 if (!*rel)
1328 return; 1407 return -1;
1329 1408
1330 if (!req->ptr2) 1409 res = tmpbuf_get (tmpbuf, PATH_MAX * 3);
1331 {
1332 X_LOCK (wrklock);
1333 req->flags |= EIO_FLAG_PTR2_FREE;
1334 X_UNLOCK (wrklock);
1335 req->ptr2 = malloc (PATH_MAX * 3);
1336
1337 errno = ENOMEM;
1338 if (!req->ptr2)
1339 return;
1340 }
1341
1342 res = req->ptr2;
1343 tmp1 = res + PATH_MAX; 1410 tmp1 = res + PATH_MAX;
1344 tmp2 = tmp1 + PATH_MAX; 1411 tmp2 = tmp1 + PATH_MAX;
1345 1412
1346#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 */
1347#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1414#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1366#endif 1433#endif
1367#endif 1434#endif
1368 1435
1369 if (*rel != '/') 1436 if (*rel != '/')
1370 { 1437 {
1371 if (!getcwd (res, PATH_MAX)) 1438 if (!eio__getwd (tmpbuf, wd))
1372 return; 1439 return -1;
1373 1440
1374 if (res [1]) /* only use if not / */ 1441 if (res [1]) /* only use if not / */
1375 res += strlen (res); 1442 res += strlen (res);
1376 } 1443 }
1377 1444
1378 while (*rel) 1445 while (*rel)
1379 { 1446 {
1380 eio_ssize_t len, linklen; 1447 eio_ssize_t len, linklen;
1381 char *beg = rel; 1448 const char *beg = rel;
1382 1449
1383 while (*rel && *rel != '/') 1450 while (*rel && *rel != '/')
1384 ++rel; 1451 ++rel;
1385 1452
1386 len = rel - beg; 1453 len = rel - beg;
1398 1465
1399 if (beg [1] == '.' && len == 2) 1466 if (beg [1] == '.' && len == 2)
1400 { 1467 {
1401 /* .. - back up one component, if possible */ 1468 /* .. - back up one component, if possible */
1402 1469
1403 while (res != req->ptr2) 1470 while (res != tmpbuf->ptr)
1404 if (*--res == '/') 1471 if (*--res == '/')
1405 break; 1472 break;
1406 1473
1407 continue; 1474 continue;
1408 } 1475 }
1418 1485
1419 /* zero-terminate, for readlink */ 1486 /* zero-terminate, for readlink */
1420 res [len + 1] = 0; 1487 res [len + 1] = 0;
1421 1488
1422 /* now check if it's a symlink */ 1489 /* now check if it's a symlink */
1423 linklen = readlink (req->ptr2, tmp1, PATH_MAX); 1490 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1424 1491
1425 if (linklen < 0) 1492 if (linklen < 0)
1426 { 1493 {
1427 if (errno != EINVAL) 1494 if (errno != EINVAL)
1428 return; 1495 return -1;
1429 1496
1430 /* it's a normal directory. hopefully */ 1497 /* it's a normal directory. hopefully */
1431 res += len + 1; 1498 res += len + 1;
1432 } 1499 }
1433 else 1500 else
1435 /* yay, it was a symlink - build new path in tmp2 */ 1502 /* yay, it was a symlink - build new path in tmp2 */
1436 int rellen = strlen (rel); 1503 int rellen = strlen (rel);
1437 1504
1438 errno = ENAMETOOLONG; 1505 errno = ENAMETOOLONG;
1439 if (linklen + 1 + rellen >= PATH_MAX) 1506 if (linklen + 1 + rellen >= PATH_MAX)
1440 return; 1507 return -1;
1441 1508
1442 errno = ELOOP; 1509 errno = ELOOP;
1443 if (!--symlinks) 1510 if (!--symlinks)
1444 return; 1511 return -1;
1445 1512
1446 if (*tmp1 == '/') 1513 if (*tmp1 == '/')
1447 res = req->ptr2; /* symlink resolves to an absolute path */ 1514 res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1448 1515
1449 /* we need to be careful, as rel might point into tmp2 already */ 1516 /* we need to be careful, as rel might point into tmp2 already */
1450 memmove (tmp2 + linklen + 1, rel, rellen + 1); 1517 memmove (tmp2 + linklen + 1, rel, rellen + 1);
1451 tmp2 [linklen] = '/'; 1518 tmp2 [linklen] = '/';
1452 memcpy (tmp2, tmp1, linklen); 1519 memcpy (tmp2, tmp1, linklen);
1454 rel = tmp2; 1521 rel = tmp2;
1455 } 1522 }
1456 } 1523 }
1457 1524
1458 /* special case for the lone root path */ 1525 /* special case for the lone root path */
1459 if (res == req->ptr2) 1526 if (res == tmpbuf->ptr)
1460 *res++ = '/'; 1527 *res++ = '/';
1461 1528
1462 req->result = res - (char *)req->ptr2; 1529 return res - (char *)tmpbuf->ptr;
1463
1464done:
1465 req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1466} 1530}
1467 1531
1468static signed char 1532static signed char
1469eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1533eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1470{ 1534{
1630 eio_dent_insertion_sort (dents, size); 1694 eio_dent_insertion_sort (dents, size);
1631} 1695}
1632 1696
1633/* read a full directory */ 1697/* read a full directory */
1634static void 1698static void
1635eio__scandir (eio_req *req, etp_worker *self) 1699eio__scandir (eio_req *req)
1636{ 1700{
1637 char *name, *names; 1701 char *name, *names;
1638 int namesalloc = 4096 - sizeof (void *) * 4; 1702 int namesalloc = 4096 - sizeof (void *) * 4;
1639 int namesoffs = 0; 1703 int namesoffs = 0;
1640 int flags = req->int1; 1704 int flags = req->int1;
1672 dirp = FindFirstFile (path, &entp); 1736 dirp = FindFirstFile (path, &entp);
1673 free (path); 1737 free (path);
1674 1738
1675 if (dirp == INVALID_HANDLE_VALUE) 1739 if (dirp == INVALID_HANDLE_VALUE)
1676 { 1740 {
1677 dirp = 0; 1741 /* should steal _dosmaperr */
1678
1679 switch (GetLastError ()) 1742 switch (GetLastError ())
1680 { 1743 {
1681 case ERROR_FILE_NOT_FOUND: 1744 case ERROR_FILE_NOT_FOUND:
1682 req->result = 0; 1745 req->result = 0;
1683 break; 1746 break;
1684 1747
1685 case ERROR_INVALID_NAME: 1748 case ERROR_INVALID_NAME:
1686 case ERROR_PATH_NOT_FOUND: 1749 case ERROR_PATH_NOT_FOUND:
1687 case ERROR_NO_MORE_FILES: 1750 case ERROR_NO_MORE_FILES:
1688 errno = ENOENT; 1751 errno = ENOENT;
1689 break; 1752 break;
1690 1753
1691 case ERROR_NOT_ENOUGH_MEMORY: 1754 case ERROR_NOT_ENOUGH_MEMORY:
1692 errno = ENOMEM; 1755 errno = ENOMEM;
1693 break; 1756 break;
1694 1757
1695 default: 1758 default:
1696 errno = EINVAL; 1759 errno = EINVAL;
1697 break; 1760 break;
1698 } 1761 }
1762
1763 return;
1699 } 1764 }
1700 } 1765 }
1701#else 1766#else
1702 dirp = opendir (req->ptr1); 1767 dirp = opendir (req->ptr1);
1768
1769 if (!dirp)
1770 return;
1703#endif 1771#endif
1704 1772
1705 if (req->flags & EIO_FLAG_PTR1_FREE) 1773 if (req->flags & EIO_FLAG_PTR1_FREE)
1706 free (req->ptr1); 1774 free (req->ptr1);
1707 1775
1708 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1776 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1709 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1777 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1710 req->ptr2 = names = malloc (namesalloc); 1778 req->ptr2 = names = malloc (namesalloc);
1711 1779
1712 if (dirp && names && (!flags || dents)) 1780 if (!names || (flags && !dents))
1781 return;
1782
1713 for (;;) 1783 for (;;)
1714 { 1784 {
1715 int done; 1785 int done;
1716 1786
1717#ifdef _WIN32 1787#ifdef _WIN32
1718 done = !dirp; 1788 done = !dirp;
1719#else 1789#else
1720 errno = 0; 1790 errno = 0;
1721 entp = readdir (dirp); 1791 entp = readdir (dirp);
1722 done = !entp; 1792 done = !entp;
1723#endif 1793#endif
1724 1794
1725 if (done) 1795 if (done)
1726 { 1796 {
1727#ifndef _WIN32 1797#ifndef _WIN32
1728 int old_errno = errno; 1798 int old_errno = errno;
1729 closedir (dirp); 1799 closedir (dirp);
1730 errno = old_errno; 1800 errno = old_errno;
1731 1801
1732 if (errno) 1802 if (errno)
1733 break; 1803 break;
1734#endif 1804#endif
1735 1805
1736 /* sort etc. */ 1806 /* sort etc. */
1737 req->int1 = flags; 1807 req->int1 = flags;
1738 req->result = dentoffs; 1808 req->result = dentoffs;
1739 1809
1740 if (flags & EIO_READDIR_STAT_ORDER) 1810 if (flags & EIO_READDIR_STAT_ORDER)
1741 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits); 1811 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1742 else if (flags & EIO_READDIR_DIRS_FIRST) 1812 else if (flags & EIO_READDIR_DIRS_FIRST)
1743 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1813 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1744 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */ 1814 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1745 else 1815 else
1816 {
1817 /* in this case, all is known, and we just put dirs first and sort them */
1818 eio_dirent *oth = dents + dentoffs;
1819 eio_dirent *dir = dents;
1820
1821 /* now partition dirs to the front, and non-dirs to the back */
1822 /* by walking from both sides and swapping if necessary */
1823 while (oth > dir)
1824 {
1825 if (dir->type == EIO_DT_DIR)
1826 ++dir;
1827 else if ((--oth)->type == EIO_DT_DIR)
1828 {
1829 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1830
1831 ++dir;
1832 }
1833 }
1834
1835 /* now sort the dirs only (dirs all have the same score) */
1836 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1837 }
1838
1839 break;
1840 }
1841
1842 /* now add the entry to our list(s) */
1843 name = D_NAME (entp);
1844
1845 /* skip . and .. entries */
1846 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1847 {
1848 int len = D_NAMLEN (entp) + 1;
1849
1850 while (ecb_expect_false (namesoffs + len > namesalloc))
1851 {
1852 namesalloc *= 2;
1853 req->ptr2 = names = realloc (names, namesalloc);
1854
1855 if (!names)
1856 break;
1857 }
1858
1859 memcpy (names + namesoffs, name, len);
1860
1861 if (dents)
1862 {
1863 struct eio_dirent *ent;
1864
1865 if (ecb_expect_false (dentoffs == dentalloc))
1746 { 1866 {
1747 /* in this case, all is known, and we just put dirs first and sort them */ 1867 dentalloc *= 2;
1868 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1869
1870 if (!dents)
1871 break;
1872 }
1873
1748 eio_dirent *oth = dents + dentoffs; 1874 ent = dents + dentoffs;
1749 eio_dirent *dir = dents;
1750 1875
1751 /* now partition dirs to the front, and non-dirs to the back */ 1876 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1752 /* by walking from both sides and swapping if necessary */ 1877 ent->namelen = len - 1;
1753 while (oth > dir) 1878 ent->inode = D_INO (entp);
1879
1880 inode_bits |= ent->inode;
1881
1882 switch (D_TYPE (entp))
1883 {
1884 default:
1885 ent->type = EIO_DT_UNKNOWN;
1886 flags |= EIO_READDIR_FOUND_UNKNOWN;
1887 break;
1888
1889 #ifdef DT_FIFO
1890 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1891 #endif
1892 #ifdef DT_CHR
1893 case DT_CHR: ent->type = EIO_DT_CHR; break;
1894 #endif
1895 #ifdef DT_MPC
1896 case DT_MPC: ent->type = EIO_DT_MPC; break;
1897 #endif
1898 #ifdef DT_DIR
1899 case DT_DIR: ent->type = EIO_DT_DIR; break;
1900 #endif
1901 #ifdef DT_NAM
1902 case DT_NAM: ent->type = EIO_DT_NAM; break;
1903 #endif
1904 #ifdef DT_BLK
1905 case DT_BLK: ent->type = EIO_DT_BLK; break;
1906 #endif
1907 #ifdef DT_MPB
1908 case DT_MPB: ent->type = EIO_DT_MPB; break;
1909 #endif
1910 #ifdef DT_REG
1911 case DT_REG: ent->type = EIO_DT_REG; break;
1912 #endif
1913 #ifdef DT_NWK
1914 case DT_NWK: ent->type = EIO_DT_NWK; break;
1915 #endif
1916 #ifdef DT_CMP
1917 case DT_CMP: ent->type = EIO_DT_CMP; break;
1918 #endif
1919 #ifdef DT_LNK
1920 case DT_LNK: ent->type = EIO_DT_LNK; break;
1921 #endif
1922 #ifdef DT_SOCK
1923 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1924 #endif
1925 #ifdef DT_DOOR
1926 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1927 #endif
1928 #ifdef DT_WHT
1929 case DT_WHT: ent->type = EIO_DT_WHT; break;
1930 #endif
1931 }
1932
1933 ent->score = 7;
1934
1935 if (flags & EIO_READDIR_DIRS_FIRST)
1936 {
1937 if (ent->type == EIO_DT_UNKNOWN)
1754 { 1938 {
1755 if (dir->type == EIO_DT_DIR) 1939 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1756 ++dir; 1940 ent->score = 1;
1757 else if ((--oth)->type == EIO_DT_DIR) 1941 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1758 { 1942 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1759 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1760
1761 ++dir;
1762 }
1763 } 1943 }
1764 1944 else if (ent->type == EIO_DT_DIR)
1765 /* now sort the dirs only (dirs all have the same score) */ 1945 ent->score = 0;
1766 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1767 } 1946 }
1768
1769 break;
1770 }
1771
1772 /* now add the entry to our list(s) */
1773 name = D_NAME (entp);
1774
1775 /* skip . and .. entries */
1776 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1777 {
1778 int len = D_NAMLEN (entp) + 1;
1779
1780 while (ecb_expect_false (namesoffs + len > namesalloc))
1781 {
1782 namesalloc *= 2;
1783 req->ptr2 = names = realloc (names, namesalloc);
1784
1785 if (!names)
1786 break;
1787 } 1947 }
1788 1948
1789 memcpy (names + namesoffs, name, len);
1790
1791 if (dents)
1792 {
1793 struct eio_dirent *ent;
1794
1795 if (ecb_expect_false (dentoffs == dentalloc))
1796 {
1797 dentalloc *= 2;
1798 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1799
1800 if (!dents)
1801 break;
1802 }
1803
1804 ent = dents + dentoffs;
1805
1806 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1807 ent->namelen = len - 1;
1808 ent->inode = D_INO (entp);
1809
1810 inode_bits |= ent->inode;
1811
1812 switch (D_TYPE (entp))
1813 {
1814 default:
1815 ent->type = EIO_DT_UNKNOWN;
1816 flags |= EIO_READDIR_FOUND_UNKNOWN;
1817 break;
1818
1819 #ifdef DT_FIFO
1820 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1821 #endif
1822 #ifdef DT_CHR
1823 case DT_CHR: ent->type = EIO_DT_CHR; break;
1824 #endif
1825 #ifdef DT_MPC
1826 case DT_MPC: ent->type = EIO_DT_MPC; break;
1827 #endif
1828 #ifdef DT_DIR
1829 case DT_DIR: ent->type = EIO_DT_DIR; break;
1830 #endif
1831 #ifdef DT_NAM
1832 case DT_NAM: ent->type = EIO_DT_NAM; break;
1833 #endif
1834 #ifdef DT_BLK
1835 case DT_BLK: ent->type = EIO_DT_BLK; break;
1836 #endif
1837 #ifdef DT_MPB
1838 case DT_MPB: ent->type = EIO_DT_MPB; break;
1839 #endif
1840 #ifdef DT_REG
1841 case DT_REG: ent->type = EIO_DT_REG; break;
1842 #endif
1843 #ifdef DT_NWK
1844 case DT_NWK: ent->type = EIO_DT_NWK; break;
1845 #endif
1846 #ifdef DT_CMP
1847 case DT_CMP: ent->type = EIO_DT_CMP; break;
1848 #endif
1849 #ifdef DT_LNK
1850 case DT_LNK: ent->type = EIO_DT_LNK; break;
1851 #endif
1852 #ifdef DT_SOCK
1853 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1854 #endif
1855 #ifdef DT_DOOR
1856 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1857 #endif
1858 #ifdef DT_WHT
1859 case DT_WHT: ent->type = EIO_DT_WHT; break;
1860 #endif
1861 }
1862
1863 ent->score = 7;
1864
1865 if (flags & EIO_READDIR_DIRS_FIRST)
1866 {
1867 if (ent->type == EIO_DT_UNKNOWN)
1868 {
1869 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1870 ent->score = 1;
1871 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1872 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1873 }
1874 else if (ent->type == EIO_DT_DIR)
1875 ent->score = 0;
1876 }
1877 }
1878
1879 namesoffs += len; 1949 namesoffs += len;
1880 ++dentoffs; 1950 ++dentoffs;
1881 } 1951 }
1882 1952
1883 if (EIO_CANCELLED (req)) 1953 if (EIO_CANCELLED (req))
1884 { 1954 {
1885 errno = ECANCELED; 1955 errno = ECANCELED;
1886 break; 1956 break;
1887 } 1957 }
1888 1958
1889#ifdef _WIN32 1959#ifdef _WIN32
1890 if (!FindNextFile (dirp, &entp)) 1960 if (!FindNextFile (dirp, &entp))
1891 { 1961 {
1892 FindClose (dirp); 1962 FindClose (dirp);
1893 dirp = 0; 1963 dirp = 0;
1894 } 1964 }
1895#endif 1965#endif
1966 }
1967}
1968
1969/*****************************************************************************/
1970/* working directory stuff */
1971
1972#if HAVE_AT
1973
1974#define WD2FD(wd) ((wd) ? ((int)(long)(wd)) - 1 : AT_FDCWD)
1975
1976#ifndef O_SEARCH
1977# define O_SEARCH O_RDONLY
1978#endif
1979
1980eio_wd
1981eio_wd_open_sync (eio_wd wd, const char *path)
1982{
1983 int fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1984
1985 return fd >= 0 ? (eio_wd)(long)(fd + 1) : EIO_INVALID_WD;
1986}
1987
1988static eio_wd
1989eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
1990{
1991 return eio_wd_open_sync (wd, path);
1992}
1993
1994void
1995eio_wd_close_sync (eio_wd wd)
1996{
1997 int fd = WD2FD (wd);
1998
1999 if (fd >= 0)
2000 close (fd);
2001}
2002
2003static int
2004eio__truncateat (int dirfd, const char *path, off_t length)
2005{
2006 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
2007 int res;
2008
2009 if (fd < 0)
2010 return fd;
2011
2012 res = ftruncate (fd, length);
2013 close (fd);
2014 return res;
2015}
2016
2017static int
2018eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
2019{
2020 int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC);
2021 int res;
2022
2023 if (fd < 0)
2024 return fd;
2025
2026 res = fstatvfs (fd, buf);
2027 close (fd);
2028 return res;
2029
2030}
2031
2032#else
2033
2034/* on legacy systems, we represent the working directories simply by their path strings */
2035
2036static const char *
2037wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2038{
2039 if (!wd || *path == '/')
2040 return path;
2041
2042 {
2043 int l1 = strlen ((const char *)wd);
2044 int l2 = strlen (path);
2045
2046 char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2);
2047
2048 memcpy (res, wd, l1);
2049 res [l1] = '/';
2050 memcpy (res + l1 + 1, path, l2 + 1);
2051
2052 return res;
2053 }
2054}
2055
2056static eio_wd
2057eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2058{
2059 if (*path == '/') /* absolute paths ignore wd */
2060 path = strdup (path);
2061 else if (path [0] == '.' && !path [1]) /* special case '.', as it is common */
2062 return wd;
2063 else
2064 {
2065 int len = eio__realpath (tmpbuf, wd, path);
2066
2067 path = EIO_INVALID_WD;
2068
2069 if (len >= 0)
2070 {
2071 ((char *)tmpbuf->ptr)[len] = 0;
2072 path = strdup (tmpbuf->ptr);
1896 } 2073 }
2074 }
2075
2076 if (!path)
2077 path = EIO_INVALID_WD;
2078
2079 return (eio_wd)path;
1897} 2080}
2081
2082eio_wd
2083eio_wd_open_sync (eio_wd wd, const char *path)
2084{
2085 struct tmpbuf tmpbuf = { 0 };
2086 wd = eio__wd_open_sync (&tmpbuf, wd, path);
2087 free (tmpbuf.ptr);
2088
2089 return wd;
2090}
2091
2092void
2093eio_wd_close_sync (eio_wd wd)
2094{
2095 if (wd != EIO_INVALID_WD)
2096 free (wd);
2097}
2098
2099#endif
1898 2100
1899/*****************************************************************************/ 2101/*****************************************************************************/
1900 2102
1901#define ALLOC(len) \ 2103#define ALLOC(len) \
1902 if (!req->ptr2) \ 2104 if (!req->ptr2) \
1932 2134
1933 X_LOCK (reqlock); 2135 X_LOCK (reqlock);
1934 2136
1935 for (;;) 2137 for (;;)
1936 { 2138 {
1937 self->req = req = reqq_shift (&req_queue); 2139 req = reqq_shift (&req_queue);
1938 2140
1939 if (req) 2141 if (req)
1940 break; 2142 break;
1941 2143
1942 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */ 2144 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
1980 ++npending; 2182 ++npending;
1981 2183
1982 if (!reqq_push (&res_queue, req) && want_poll_cb) 2184 if (!reqq_push (&res_queue, req) && want_poll_cb)
1983 want_poll_cb (); 2185 want_poll_cb ();
1984 2186
1985 self->req = 0;
1986 etp_worker_clear (self); 2187 etp_worker_clear (self);
1987 2188
1988 X_UNLOCK (reslock); 2189 X_UNLOCK (reslock);
1989 } 2190 }
1990 2191
1991quit: 2192quit:
2193 free (req);
2194
1992 X_LOCK (wrklock); 2195 X_LOCK (wrklock);
1993 etp_worker_free (self); 2196 etp_worker_free (self);
1994 X_UNLOCK (wrklock); 2197 X_UNLOCK (wrklock);
1995 2198
1996 return 0; 2199 return 0;
2039 } 2242 }
2040 2243
2041static void 2244static void
2042eio_execute (etp_worker *self, eio_req *req) 2245eio_execute (etp_worker *self, eio_req *req)
2043{ 2246{
2247#if HAVE_AT
2248 int dirfd;
2249#else
2250 const char *path;
2251#endif
2252
2044 if (ecb_expect_false (EIO_CANCELLED (req))) 2253 if (ecb_expect_false (EIO_CANCELLED (req)))
2045 { 2254 {
2046 req->result = -1; 2255 req->result = -1;
2047 req->errorno = ECANCELED; 2256 req->errorno = ECANCELED;
2048 return; 2257 return;
2049 } 2258 }
2050 2259
2260 if (ecb_expect_false (req->wd == EIO_INVALID_WD))
2261 {
2262 req->result = -1;
2263 req->errorno = ENOENT;
2264 return;
2265 }
2266
2267 if (req->type >= EIO_OPEN)
2268 {
2269 #if HAVE_AT
2270 dirfd = WD2FD (req->wd);
2271 #else
2272 path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
2273 #endif
2274 }
2275
2051 switch (req->type) 2276 switch (req->type)
2052 { 2277 {
2278 case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
2279 req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
2280 break;
2281 case EIO_WD_CLOSE: req->result = 0;
2282 eio_wd_close_sync (req->wd); break;
2283
2053 case EIO_READ: ALLOC (req->size); 2284 case EIO_READ: ALLOC (req->size);
2054 req->result = req->offs >= 0 2285 req->result = req->offs >= 0
2055 ? pread (req->int1, req->ptr2, req->size, req->offs) 2286 ? pread (req->int1, req->ptr2, req->size, req->offs)
2056 : read (req->int1, req->ptr2, req->size); break; 2287 : read (req->int1, req->ptr2, req->size); break;
2057 case EIO_WRITE: req->result = req->offs >= 0 2288 case EIO_WRITE: req->result = req->offs >= 0
2059 : write (req->int1, req->ptr2, req->size); break; 2290 : write (req->int1, req->ptr2, req->size); break;
2060 2291
2061 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 2292 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
2062 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break; 2293 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
2063 2294
2295#if HAVE_AT
2296
2064 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2297 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2065 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2298 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
2066 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2299 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2300 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
2301 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
2302 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
2303 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
2304 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
2305
2306 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
2307 case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
2308 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
2309 case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD (req->int3), req->ptr2); break;
2310 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD (req->int3), req->ptr2, 0); break;
2311 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
2312 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2313 case EIO_READLINK: ALLOC (PATH_MAX);
2314 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
2315 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2316 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2317 case EIO_UTIME:
2318 case EIO_FUTIME:
2319 {
2320 struct timespec ts[2];
2321 struct timespec *times;
2322
2323 if (req->nv1 != -1. || req->nv2 != -1.)
2324 {
2325 ts[0].tv_sec = req->nv1;
2326 ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
2327 ts[1].tv_sec = req->nv2;
2328 ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
2329
2330 times = ts;
2331 }
2332 else
2333 times = 0;
2334
2335 req->result = req->type == EIO_FUTIME
2336 ? futimens (req->int1, times)
2337 : utimensat (dirfd, req->ptr1, times, 0);
2338 }
2339 break;
2340
2341#else
2342
2343 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2344 req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2345 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2067 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2346 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2347 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
2348 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
2349 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
2350 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
2351
2352 case EIO_UNLINK: req->result = unlink (path ); break;
2353 case EIO_RMDIR: req->result = rmdir (path ); break;
2354 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
2355 case EIO_RENAME: req->result = rename (path , req->ptr2); break;
2356 case EIO_LINK: req->result = link (path , req->ptr2); break;
2357 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
2358 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
2359 case EIO_READLINK: ALLOC (PATH_MAX);
2360 req->result = readlink (path, req->ptr2, PATH_MAX); break;
2361 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2362 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
2363
2364 case EIO_UTIME:
2365 case EIO_FUTIME:
2366 {
2367 struct timeval tv[2];
2368 struct timeval *times;
2369
2370 if (req->nv1 != -1. || req->nv2 != -1.)
2371 {
2372 tv[0].tv_sec = req->nv1;
2373 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
2374 tv[1].tv_sec = req->nv2;
2375 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
2376
2377 times = tv;
2378 }
2379 else
2380 times = 0;
2381
2382 req->result = req->type == EIO_FUTIME
2383 ? futimes (req->int1, times)
2384 : utimes (req->ptr1, times);
2385 }
2386 break;
2387
2388#endif
2389
2390 case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
2391 {
2392 ALLOC (req->result);
2393 memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
2394 }
2395 break;
2396
2068 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2397 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2069 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 2398 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
2070 2399
2071 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2072 req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2073 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 2400 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2074 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 2401 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2075 2402
2076 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
2077 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break; 2403 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
2078 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
2079 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break; 2404 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
2080 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
2081 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break; 2405 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2082 2406
2083 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
2084 case EIO_CLOSE: req->result = close (req->int1); break; 2407 case EIO_CLOSE: req->result = close (req->int1); break;
2085 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 2408 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
2086 case EIO_UNLINK: req->result = unlink (req->ptr1); break;
2087 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
2088 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
2089 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
2090 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
2091 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
2092 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2093
2094 case EIO_REALPATH: eio__realpath (req, self); break;
2095
2096 case EIO_READLINK: ALLOC (PATH_MAX);
2097 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
2098
2099 case EIO_SYNC: req->result = 0; sync (); break; 2409 case EIO_SYNC: req->result = 0; sync (); break;
2100 case EIO_FSYNC: req->result = fsync (req->int1); break; 2410 case EIO_FSYNC: req->result = fsync (req->int1); break;
2101 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2411 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2102 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break; 2412 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
2103 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break; 2413 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2105 case EIO_MTOUCH: req->result = eio__mtouch (req); break; 2415 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2106 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break; 2416 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2107 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 2417 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2108 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break; 2418 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2109 2419
2110 case EIO_READDIR: eio__scandir (req, self); break; 2420 case EIO_READDIR: eio__scandir (req); break;
2111 2421
2112 case EIO_BUSY: 2422 case EIO_BUSY:
2113#ifdef _WIN32 2423#ifdef _WIN32
2114 Sleep (req->nv1 * 1e3); 2424 Sleep (req->nv1 * 1e3);
2115#else 2425#else
2122 req->result = select (0, 0, 0, 0, &tv); 2432 req->result = select (0, 0, 0, 0, &tv);
2123 } 2433 }
2124#endif 2434#endif
2125 break; 2435 break;
2126 2436
2127 case EIO_UTIME:
2128 case EIO_FUTIME:
2129 {
2130 struct timeval tv[2];
2131 struct timeval *times;
2132
2133 if (req->nv1 != -1. || req->nv2 != -1.)
2134 {
2135 tv[0].tv_sec = req->nv1;
2136 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
2137 tv[1].tv_sec = req->nv2;
2138 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
2139
2140 times = tv;
2141 }
2142 else
2143 times = 0;
2144
2145 req->result = req->type == EIO_FUTIME
2146 ? futimes (req->int1, times)
2147 : utimes (req->ptr1, times);
2148 }
2149 break;
2150
2151 case EIO_GROUP: 2437 case EIO_GROUP:
2152 abort (); /* handled in eio_request */ 2438 abort (); /* handled in eio_request */
2153 2439
2154 case EIO_NOP: 2440 case EIO_NOP:
2155 req->result = 0; 2441 req->result = 0;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines