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

Comparing libeio/eio.c (file contents):
Revision 1.100 by root, Tue Jul 26 11:32:16 2011 UTC vs.
Revision 1.120 by root, Tue Apr 24 18:47:50 2012 UTC

1/* 1/*
2 * libeio implementation 2 * libeio implementation
3 * 3 *
4 * Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libeio@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann <libeio@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
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>
… …
208 #endif 208 #endif
209 209
210 #define D_NAME(entp) entp->d_name 210 #define D_NAME(entp) entp->d_name
211 211
212 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */ 212 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
213 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 213 #if __FreeBSD__ || __NetBSD__ || __OpenBSD__
214 #define _DIRENT_HAVE_D_TYPE /* sigh */ 214 #define _DIRENT_HAVE_D_TYPE /* sigh */
215 #define D_INO(de) (de)->d_fileno 215 #define D_INO(de) (de)->d_fileno
216 #define D_NAMLEN(de) (de)->d_namlen 216 #define D_NAMLEN(de) (de)->d_namlen
217 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600 217 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
218 #define D_INO(de) (de)->d_ino 218 #define D_INO(de) (de)->d_ino
… …
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
… …
324static void (*done_poll_cb) (void); 368static void (*done_poll_cb) (void);
325 369
326static unsigned int max_poll_time; /* reslock */ 370static unsigned int max_poll_time; /* reslock */
327static unsigned int max_poll_reqs; /* reslock */ 371static unsigned int max_poll_reqs; /* reslock */
328 372
329static volatile unsigned int nreqs; /* reqlock */ 373static unsigned int nreqs; /* reqlock */
330static volatile unsigned int nready; /* reqlock */ 374static unsigned int nready; /* reqlock */
331static volatile unsigned int npending; /* reqlock */ 375static unsigned int npending; /* reqlock */
332static 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 */
333static 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 */
334 378
335static xmutex_t wrklock; 379static xmutex_t wrklock;
336static xmutex_t reslock; 380static xmutex_t reslock;
337static xmutex_t reqlock; 381static xmutex_t reqlock;
338static xcond_t reqwait; 382static xcond_t reqwait;
… …
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);
… …
987 int res; 1032 int res;
988 1033
989#if HAVE_SYS_SYNCFS 1034#if HAVE_SYS_SYNCFS
990 res = (int)syscall (__NR_syncfs, (int)(fd)); 1035 res = (int)syscall (__NR_syncfs, (int)(fd));
991#else 1036#else
992 res = -1; 1037 res = EIO_ENOSYS ();
993 errno = ENOSYS;
994#endif 1038#endif
995 1039
996 if (res < 0 && errno == ENOSYS && fd >= 0) 1040 if (res < 0 && errno == ENOSYS && fd >= 0)
997 sync (); 1041 sync ();
998 1042
… …
1028} 1072}
1029 1073
1030static int 1074static int
1031eio__fallocate (int fd, int mode, off_t offset, size_t len) 1075eio__fallocate (int fd, int mode, off_t offset, size_t len)
1032{ 1076{
1033#if HAVE_FALLOCATE 1077#if HAVE_LINUX_FALLOCATE
1034 return fallocate (fd, mode, offset, len); 1078 return fallocate (fd, mode, offset, len);
1035#else 1079#else
1036 errno = ENOSYS; 1080 return EIO_ENOSYS ();
1037 return -1;
1038#endif 1081#endif
1039} 1082}
1040 1083
1041#if !HAVE_READAHEAD 1084#if !HAVE_READAHEAD
1042# undef readahead 1085# undef readahead
… …
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 */
… …
1103 1147
1104 /* according to source inspection, this is correct, and useful behaviour */ 1148 /* according to source inspection, this is correct, and useful behaviour */
1105 if (sbytes) 1149 if (sbytes)
1106 res = sbytes; 1150 res = sbytes;
1107 1151
1108# elif defined (__APPLE__) 1152# elif defined __APPLE__
1109 off_t sbytes = count; 1153 off_t sbytes = count;
1110 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 1154 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1111 1155
1112 /* according to the manpage, sbytes is always valid */ 1156 /* according to the manpage, sbytes is always valid */
1113 if (sbytes) 1157 if (sbytes)
… …
1140 HANDLE h = TO_SOCKET (ifd); 1184 HANDLE h = TO_SOCKET (ifd);
1141 SetFilePointer (h, offset, 0, FILE_BEGIN); 1185 SetFilePointer (h, offset, 0, FILE_BEGIN);
1142 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0); 1186 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1143 1187
1144#else 1188#else
1145 res = -1; 1189 res = EIO_ENOSYS ();
1146 errno = ENOSYS;
1147#endif 1190#endif
1148 1191
1149 /* we assume sendfile can copy at least 128mb in one go */ 1192 /* we assume sendfile can copy at least 128mb in one go */
1150 if (res <= 128 * 1024 * 1024) 1193 if (res <= 128 * 1024 * 1024)
1151 { 1194 {
… …
1338 1381
1339/*****************************************************************************/ 1382/*****************************************************************************/
1340/* requests implemented outside eio_execute, because they are so large */ 1383/* requests implemented outside eio_execute, because they are so large */
1341 1384
1342static void 1385static void
1343eio__realpath (eio_req *req, etp_worker *self) 1386eio__lseek (eio_req *req)
1344{ 1387{
1345 char *rel = req->ptr1; 1388 /* this usually gets optimised away completely, or your compiler sucks, */
1389 /* or the whence constants really are not 0, 1, 2 */
1390 int whence = req->int2 == EIO_SEEK_SET ? SEEK_SET
1391 : req->int2 == EIO_SEEK_CUR ? SEEK_CUR
1392 : req->int2 == EIO_SEEK_END ? SEEK_END
1393 : req->int2;
1394
1395 req->offs = lseek (req->int1, req->offs, whence);
1396 req->result = req->offs == (off_t)-1 ? -1 : 0;
1397}
1398
1399/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
1400static int
1401eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
1402{
1403 const char *rel = path;
1346 char *res; 1404 char *res;
1347 char *tmp1, *tmp2; 1405 char *tmp1, *tmp2;
1348#if SYMLOOP_MAX > 32 1406#if SYMLOOP_MAX > 32
1349 int symlinks = SYMLOOP_MAX; 1407 int symlinks = SYMLOOP_MAX;
1350#else 1408#else
1351 int symlinks = 32; 1409 int symlinks = 32;
1352#endif 1410#endif
1353 1411
1354 req->result = -1;
1355
1356 errno = EINVAL; 1412 errno = EINVAL;
1357 if (!rel) 1413 if (!rel)
1358 return; 1414 return -1;
1359 1415
1360 errno = ENOENT; 1416 errno = ENOENT;
1361 if (!*rel) 1417 if (!*rel)
1362 return; 1418 return -1;
1363 1419
1364 if (!req->ptr2) 1420 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; 1421 tmp1 = res + PATH_MAX;
1378 tmp2 = tmp1 + PATH_MAX; 1422 tmp2 = tmp1 + PATH_MAX;
1379 1423
1380#if 0 /* disabled, the musl way to do things is just too racy */ 1424#if 0 /* disabled, the musl way to do things is just too racy */
1381#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1425#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
… …
1400#endif 1444#endif
1401#endif 1445#endif
1402 1446
1403 if (*rel != '/') 1447 if (*rel != '/')
1404 { 1448 {
1449 int len;
1450
1451 errno = ENOENT;
1452 if (wd == EIO_INVALID_WD)
1453 return -1;
1454
1455 if (wd == EIO_CWD)
1456 {
1405 if (!getcwd (res, PATH_MAX)) 1457 if (!getcwd (res, PATH_MAX))
1406 return; 1458 return -1;
1459
1460 len = strlen (res);
1461 }
1462 else
1463 memcpy (res, wd->str, len = wd->len);
1407 1464
1408 if (res [1]) /* only use if not / */ 1465 if (res [1]) /* only use if not / */
1409 res += strlen (res); 1466 res += len;
1410 } 1467 }
1411 1468
1412 while (*rel) 1469 while (*rel)
1413 { 1470 {
1414 eio_ssize_t len, linklen; 1471 eio_ssize_t len, linklen;
1415 char *beg = rel; 1472 const char *beg = rel;
1416 1473
1417 while (*rel && *rel != '/') 1474 while (*rel && *rel != '/')
1418 ++rel; 1475 ++rel;
1419 1476
1420 len = rel - beg; 1477 len = rel - beg;
… …
1432 1489
1433 if (beg [1] == '.' && len == 2) 1490 if (beg [1] == '.' && len == 2)
1434 { 1491 {
1435 /* .. - back up one component, if possible */ 1492 /* .. - back up one component, if possible */
1436 1493
1437 while (res != req->ptr2) 1494 while (res != tmpbuf->ptr)
1438 if (*--res == '/') 1495 if (*--res == '/')
1439 break; 1496 break;
1440 1497
1441 continue; 1498 continue;
1442 } 1499 }
1443 } 1500 }
1444 1501
1445 errno = ENAMETOOLONG; 1502 errno = ENAMETOOLONG;
1446 if (res + 1 + len + 1 >= tmp1) 1503 if (res + 1 + len + 1 >= tmp1)
1447 return; 1504 return -1;
1448 1505
1449 /* copy one component */ 1506 /* copy one component */
1450 *res = '/'; 1507 *res = '/';
1451 memcpy (res + 1, beg, len); 1508 memcpy (res + 1, beg, len);
1452 1509
1453 /* zero-terminate, for readlink */ 1510 /* zero-terminate, for readlink */
1454 res [len + 1] = 0; 1511 res [len + 1] = 0;
1455 1512
1456 /* now check if it's a symlink */ 1513 /* now check if it's a symlink */
1457 linklen = readlink (req->ptr2, tmp1, PATH_MAX); 1514 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1458 1515
1459 if (linklen < 0) 1516 if (linklen < 0)
1460 { 1517 {
1461 if (errno != EINVAL) 1518 if (errno != EINVAL)
1462 return; 1519 return -1;
1463 1520
1464 /* it's a normal directory. hopefully */ 1521 /* it's a normal directory. hopefully */
1465 res += len + 1; 1522 res += len + 1;
1466 } 1523 }
1467 else 1524 else
… …
1469 /* yay, it was a symlink - build new path in tmp2 */ 1526 /* yay, it was a symlink - build new path in tmp2 */
1470 int rellen = strlen (rel); 1527 int rellen = strlen (rel);
1471 1528
1472 errno = ENAMETOOLONG; 1529 errno = ENAMETOOLONG;
1473 if (linklen + 1 + rellen >= PATH_MAX) 1530 if (linklen + 1 + rellen >= PATH_MAX)
1474 return; 1531 return -1;
1475 1532
1476 errno = ELOOP; 1533 errno = ELOOP;
1477 if (!--symlinks) 1534 if (!--symlinks)
1478 return; 1535 return -1;
1479 1536
1480 if (*tmp1 == '/') 1537 if (*tmp1 == '/')
1481 res = req->ptr2; /* symlink resolves to an absolute path */ 1538 res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1482 1539
1483 /* we need to be careful, as rel might point into tmp2 already */ 1540 /* we need to be careful, as rel might point into tmp2 already */
1484 memmove (tmp2 + linklen + 1, rel, rellen + 1); 1541 memmove (tmp2 + linklen + 1, rel, rellen + 1);
1485 tmp2 [linklen] = '/'; 1542 tmp2 [linklen] = '/';
1486 memcpy (tmp2, tmp1, linklen); 1543 memcpy (tmp2, tmp1, linklen);
… …
1488 rel = tmp2; 1545 rel = tmp2;
1489 } 1546 }
1490 } 1547 }
1491 1548
1492 /* special case for the lone root path */ 1549 /* special case for the lone root path */
1493 if (res == req->ptr2) 1550 if (res == tmpbuf->ptr)
1494 *res++ = '/'; 1551 *res++ = '/';
1495 1552
1496 req->result = res - (char *)req->ptr2; 1553 return res - (char *)tmpbuf->ptr;
1497
1498done:
1499 req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1500} 1554}
1501 1555
1502static signed char 1556static signed char
1503eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1557eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1504{ 1558{
… …
1692#ifdef _WIN32 1746#ifdef _WIN32
1693 { 1747 {
1694 int len = strlen ((const char *)req->ptr1); 1748 int len = strlen ((const char *)req->ptr1);
1695 char *path = malloc (MAX_PATH); 1749 char *path = malloc (MAX_PATH);
1696 const char *fmt; 1750 const char *fmt;
1751 const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1697 1752
1698 if (!len) 1753 if (!len)
1699 fmt = "./*"; 1754 fmt = "./*";
1700 else if (((const char *)req->ptr1)[len - 1] == '/' || ((const char *)req->ptr1)[len - 1] == '\\') 1755 else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1701 fmt = "%s*"; 1756 fmt = "%s*";
1702 else 1757 else
1703 fmt = "%s/*"; 1758 fmt = "%s/*";
1704 1759
1705 _snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1); 1760 _snprintf (path, MAX_PATH, fmt, reqpath);
1706 dirp = FindFirstFile (path, &entp); 1761 dirp = FindFirstFile (path, &entp);
1707 free (path); 1762 free (path);
1708 1763
1709 if (dirp == INVALID_HANDLE_VALUE) 1764 if (dirp == INVALID_HANDLE_VALUE)
1710 { 1765 {
1711 dirp = 0;
1712
1713 /* should steal _dosmaperr */ 1766 /* should steal _dosmaperr */
1714 switch (GetLastError ()) 1767 switch (GetLastError ())
1715 { 1768 {
1716 case ERROR_FILE_NOT_FOUND: 1769 case ERROR_FILE_NOT_FOUND:
1717 req->result = 0; 1770 req->result = 0;
1718 break; 1771 break;
1719 1772
1720 case ERROR_INVALID_NAME: 1773 case ERROR_INVALID_NAME:
1721 case ERROR_PATH_NOT_FOUND: 1774 case ERROR_PATH_NOT_FOUND:
1722 case ERROR_NO_MORE_FILES: 1775 case ERROR_NO_MORE_FILES:
1723 errno = ENOENT; 1776 errno = ENOENT;
1724 break; 1777 break;
1725 1778
1726 case ERROR_NOT_ENOUGH_MEMORY: 1779 case ERROR_NOT_ENOUGH_MEMORY:
1727 errno = ENOMEM; 1780 errno = ENOMEM;
1728 break; 1781 break;
1729 1782
1730 default: 1783 default:
1731 errno = EINVAL; 1784 errno = EINVAL;
1732 break; 1785 break;
1733 } 1786 }
1787
1788 return;
1734 } 1789 }
1735 } 1790 }
1736#else 1791#else
1792 #if HAVE_AT
1793 if (req->wd)
1794 {
1795 int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1796
1797 if (fd < 0)
1798 return;
1799
1800 dirp = fdopendir (fd);
1801
1802 if (!dirp)
1803 close (fd);
1804 }
1805 else
1737 dirp = opendir (req->ptr1); 1806 dirp = opendir (req->ptr1);
1807 #else
1808 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
1809 #endif
1810
1811 if (!dirp)
1812 return;
1738#endif 1813#endif
1739 1814
1740 if (req->flags & EIO_FLAG_PTR1_FREE) 1815 if (req->flags & EIO_FLAG_PTR1_FREE)
1741 free (req->ptr1); 1816 free (req->ptr1);
1742 1817
1743 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1818 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1744 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1819 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1745 req->ptr2 = names = malloc (namesalloc); 1820 req->ptr2 = names = malloc (namesalloc);
1746 1821
1747 if (dirp && names && (!flags || dents)) 1822 if (!names || (flags && !dents))
1823 return;
1824
1748 for (;;) 1825 for (;;)
1749 { 1826 {
1750 int done; 1827 int done;
1751 1828
1752#ifdef _WIN32 1829#ifdef _WIN32
1753 done = !dirp; 1830 done = !dirp;
1754#else 1831#else
1755 errno = 0; 1832 errno = 0;
1756 entp = readdir (dirp); 1833 entp = readdir (dirp);
1757 done = !entp; 1834 done = !entp;
1758#endif 1835#endif
1759 1836
1760 if (done) 1837 if (done)
1761 { 1838 {
1762#ifndef _WIN32 1839#ifndef _WIN32
1763 int old_errno = errno; 1840 int old_errno = errno;
1764 closedir (dirp); 1841 closedir (dirp);
1765 errno = old_errno; 1842 errno = old_errno;
1766 1843
1767 if (errno) 1844 if (errno)
1768 break; 1845 break;
1769#endif 1846#endif
1770 1847
1771 /* sort etc. */ 1848 /* sort etc. */
1772 req->int1 = flags; 1849 req->int1 = flags;
1773 req->result = dentoffs; 1850 req->result = dentoffs;
1774 1851
1775 if (flags & EIO_READDIR_STAT_ORDER) 1852 if (flags & EIO_READDIR_STAT_ORDER)
1776 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits); 1853 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1777 else if (flags & EIO_READDIR_DIRS_FIRST) 1854 else if (flags & EIO_READDIR_DIRS_FIRST)
1778 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1855 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1779 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */ 1856 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1780 else 1857 else
1858 {
1859 /* in this case, all is known, and we just put dirs first and sort them */
1860 eio_dirent *oth = dents + dentoffs;
1861 eio_dirent *dir = dents;
1862
1863 /* now partition dirs to the front, and non-dirs to the back */
1864 /* by walking from both sides and swapping if necessary */
1865 while (oth > dir)
1866 {
1867 if (dir->type == EIO_DT_DIR)
1868 ++dir;
1869 else if ((--oth)->type == EIO_DT_DIR)
1870 {
1871 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1872
1873 ++dir;
1874 }
1875 }
1876
1877 /* now sort the dirs only (dirs all have the same score) */
1878 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1879 }
1880
1881 break;
1882 }
1883
1884 /* now add the entry to our list(s) */
1885 name = D_NAME (entp);
1886
1887 /* skip . and .. entries */
1888 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1889 {
1890 int len = D_NAMLEN (entp) + 1;
1891
1892 while (ecb_expect_false (namesoffs + len > namesalloc))
1893 {
1894 namesalloc *= 2;
1895 req->ptr2 = names = realloc (names, namesalloc);
1896
1897 if (!names)
1898 break;
1899 }
1900
1901 memcpy (names + namesoffs, name, len);
1902
1903 if (dents)
1904 {
1905 struct eio_dirent *ent;
1906
1907 if (ecb_expect_false (dentoffs == dentalloc))
1781 { 1908 {
1782 /* in this case, all is known, and we just put dirs first and sort them */ 1909 dentalloc *= 2;
1910 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1911
1912 if (!dents)
1913 break;
1914 }
1915
1783 eio_dirent *oth = dents + dentoffs; 1916 ent = dents + dentoffs;
1784 eio_dirent *dir = dents;
1785 1917
1786 /* now partition dirs to the front, and non-dirs to the back */ 1918 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1787 /* by walking from both sides and swapping if necessary */ 1919 ent->namelen = len - 1;
1788 while (oth > dir) 1920 ent->inode = D_INO (entp);
1921
1922 inode_bits |= ent->inode;
1923
1924 switch (D_TYPE (entp))
1925 {
1926 default:
1927 ent->type = EIO_DT_UNKNOWN;
1928 flags |= EIO_READDIR_FOUND_UNKNOWN;
1929 break;
1930
1931 #ifdef DT_FIFO
1932 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1933 #endif
1934 #ifdef DT_CHR
1935 case DT_CHR: ent->type = EIO_DT_CHR; break;
1936 #endif
1937 #ifdef DT_MPC
1938 case DT_MPC: ent->type = EIO_DT_MPC; break;
1939 #endif
1940 #ifdef DT_DIR
1941 case DT_DIR: ent->type = EIO_DT_DIR; break;
1942 #endif
1943 #ifdef DT_NAM
1944 case DT_NAM: ent->type = EIO_DT_NAM; break;
1945 #endif
1946 #ifdef DT_BLK
1947 case DT_BLK: ent->type = EIO_DT_BLK; break;
1948 #endif
1949 #ifdef DT_MPB
1950 case DT_MPB: ent->type = EIO_DT_MPB; break;
1951 #endif
1952 #ifdef DT_REG
1953 case DT_REG: ent->type = EIO_DT_REG; break;
1954 #endif
1955 #ifdef DT_NWK
1956 case DT_NWK: ent->type = EIO_DT_NWK; break;
1957 #endif
1958 #ifdef DT_CMP
1959 case DT_CMP: ent->type = EIO_DT_CMP; break;
1960 #endif
1961 #ifdef DT_LNK
1962 case DT_LNK: ent->type = EIO_DT_LNK; break;
1963 #endif
1964 #ifdef DT_SOCK
1965 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1966 #endif
1967 #ifdef DT_DOOR
1968 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1969 #endif
1970 #ifdef DT_WHT
1971 case DT_WHT: ent->type = EIO_DT_WHT; break;
1972 #endif
1973 }
1974
1975 ent->score = 7;
1976
1977 if (flags & EIO_READDIR_DIRS_FIRST)
1978 {
1979 if (ent->type == EIO_DT_UNKNOWN)
1789 { 1980 {
1790 if (dir->type == EIO_DT_DIR) 1981 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1791 ++dir; 1982 ent->score = 1;
1792 else if ((--oth)->type == EIO_DT_DIR) 1983 else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1793 { 1984 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 } 1985 }
1799 1986 else if (ent->type == EIO_DT_DIR)
1800 /* now sort the dirs only (dirs all have the same score) */ 1987 ent->score = 0;
1801 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1802 } 1988 }
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 } 1989 }
1823 1990
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; 1991 namesoffs += len;
1915 ++dentoffs; 1992 ++dentoffs;
1916 } 1993 }
1917 1994
1918 if (EIO_CANCELLED (req)) 1995 if (EIO_CANCELLED (req))
1919 { 1996 {
1920 errno = ECANCELED; 1997 errno = ECANCELED;
1921 break; 1998 break;
1922 } 1999 }
1923 2000
1924#ifdef _WIN32 2001#ifdef _WIN32
1925 if (!FindNextFile (dirp, &entp)) 2002 if (!FindNextFile (dirp, &entp))
1926 { 2003 {
1927 FindClose (dirp); 2004 FindClose (dirp);
1928 dirp = 0; 2005 dirp = 0;
1929 } 2006 }
1930#endif 2007#endif
1931 } 2008 }
1932} 2009}
2010
2011/*****************************************************************************/
2012/* working directory stuff */
2013/* various deficiencies in the posix 2008 api force us to */
2014/* keep the absolute path in string form at all times */
2015/* fuck yeah. */
2016
2017#if !HAVE_AT
2018
2019/* a bit like realpath, but usually faster because it doesn'T have to return */
2020/* an absolute or canonical path */
2021static const char *
2022wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2023{
2024 if (!wd || *path == '/')
2025 return path;
2026
2027 if (path [0] == '.' && !path [1])
2028 return wd->str;
2029
2030 {
2031 int l1 = wd->len;
2032 int l2 = strlen (path);
2033
2034 char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2);
2035
2036 memcpy (res, wd->str, l1);
2037 res [l1] = '/';
2038 memcpy (res + l1 + 1, path, l2 + 1);
2039
2040 return res;
2041 }
2042}
2043
2044#endif
2045
2046static eio_wd
2047eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2048{
2049 int fd;
2050 eio_wd res;
2051 int len = eio__realpath (tmpbuf, wd, path);
2052
2053 if (len < 0)
2054 return EIO_INVALID_WD;
2055
2056#if HAVE_AT
2057 fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
2058
2059 if (fd < 0)
2060 return EIO_INVALID_WD;
2061#endif
2062
2063 res = malloc (sizeof (*res) + len); /* one extra 0-byte */
2064
2065#if HAVE_AT
2066 res->fd = fd;
2067#endif
2068
2069 res->len = len;
2070 memcpy (res->str, tmpbuf->ptr, len);
2071 res->str [len] = 0;
2072
2073 return res;
2074}
2075
2076eio_wd
2077eio_wd_open_sync (eio_wd wd, const char *path)
2078{
2079 struct tmpbuf tmpbuf = { 0 };
2080 wd = eio__wd_open_sync (&tmpbuf, wd, path);
2081 free (tmpbuf.ptr);
2082
2083 return wd;
2084}
2085
2086void
2087eio_wd_close_sync (eio_wd wd)
2088{
2089 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
2090 {
2091 #if HAVE_AT
2092 close (wd->fd);
2093 #endif
2094 free (wd);
2095 }
2096}
2097
2098#if HAVE_AT
2099
2100/* they forgot these */
2101
2102static int
2103eio__truncateat (int dirfd, const char *path, off_t length)
2104{
2105 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
2106 int res;
2107
2108 if (fd < 0)
2109 return fd;
2110
2111 res = ftruncate (fd, length);
2112 close (fd);
2113 return res;
2114}
2115
2116static int
2117eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
2118{
2119 int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC);
2120 int res;
2121
2122 if (fd < 0)
2123 return fd;
2124
2125 res = fstatvfs (fd, buf);
2126 close (fd);
2127 return res;
2128
2129}
2130
2131#endif
1933 2132
1934/*****************************************************************************/ 2133/*****************************************************************************/
1935 2134
1936#define ALLOC(len) \ 2135#define ALLOC(len) \
1937 if (!req->ptr2) \ 2136 if (!req->ptr2) \
… …
1946 req->result = -1; \ 2145 req->result = -1; \
1947 break; \ 2146 break; \
1948 } \ 2147 } \
1949 } 2148 }
1950 2149
2150static void ecb_noinline ecb_cold
2151etp_proc_init (void)
2152{
2153#if HAVE_PRCTL_SET_NAME
2154 /* provide a more sensible "thread name" */
2155 char name[16 + 1];
2156 const int namelen = sizeof (name) - 1;
2157 int len;
2158
2159 prctl (PR_GET_NAME, (unsigned long)name, 0, 0, 0);
2160 name [namelen] = 0;
2161 len = strlen (name);
2162 strcpy (name + (len <= namelen - 4 ? len : namelen - 4), "/eio");
2163 prctl (PR_SET_NAME, (unsigned long)name, 0, 0, 0);
2164#endif
2165}
2166
1951X_THREAD_PROC (etp_proc) 2167X_THREAD_PROC (etp_proc)
1952{ 2168{
1953 ETP_REQ *req; 2169 ETP_REQ *req;
1954 struct timespec ts; 2170 struct timespec ts;
1955 etp_worker *self = (etp_worker *)thr_arg; 2171 etp_worker *self = (etp_worker *)thr_arg;
1956 2172
1957#if HAVE_PRCTL_SET_NAME 2173 etp_proc_init ();
1958 prctl (PR_SET_NAME, (unsigned long)"eio_thread", 0, 0, 0);
1959#endif
1960 2174
1961 /* try to distribute timeouts somewhat evenly */ 2175 /* try to distribute timeouts somewhat evenly */
1962 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 2176 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1963 2177
1964 for (;;) 2178 for (;;)
… …
1967 2181
1968 X_LOCK (reqlock); 2182 X_LOCK (reqlock);
1969 2183
1970 for (;;) 2184 for (;;)
1971 { 2185 {
1972 self->req = req = reqq_shift (&req_queue); 2186 req = reqq_shift (&req_queue);
1973 2187
1974 if (req) 2188 if (req)
1975 break; 2189 break;
1976 2190
1977 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */ 2191 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
… …
2015 ++npending; 2229 ++npending;
2016 2230
2017 if (!reqq_push (&res_queue, req) && want_poll_cb) 2231 if (!reqq_push (&res_queue, req) && want_poll_cb)
2018 want_poll_cb (); 2232 want_poll_cb ();
2019 2233
2020 self->req = 0;
2021 etp_worker_clear (self); 2234 etp_worker_clear (self);
2022 2235
2023 X_UNLOCK (reslock); 2236 X_UNLOCK (reslock);
2024 } 2237 }
2025 2238
2026quit: 2239quit:
2240 free (req);
2241
2027 X_LOCK (wrklock); 2242 X_LOCK (wrklock);
2028 etp_worker_free (self); 2243 etp_worker_free (self);
2029 X_UNLOCK (wrklock); 2244 X_UNLOCK (wrklock);
2030
2031 return 0;
2032} 2245}
2033 2246
2034/*****************************************************************************/ 2247/*****************************************************************************/
2035 2248
2036int ecb_cold 2249int ecb_cold
… …
2074 } 2287 }
2075 2288
2076static void 2289static void
2077eio_execute (etp_worker *self, eio_req *req) 2290eio_execute (etp_worker *self, eio_req *req)
2078{ 2291{
2292#if HAVE_AT
2293 int dirfd;
2294#else
2295 const char *path;
2296#endif
2297
2079 if (ecb_expect_false (EIO_CANCELLED (req))) 2298 if (ecb_expect_false (EIO_CANCELLED (req)))
2080 { 2299 {
2081 req->result = -1; 2300 req->result = -1;
2082 req->errorno = ECANCELED; 2301 req->errorno = ECANCELED;
2083 return; 2302 return;
2084 } 2303 }
2085 2304
2305 if (ecb_expect_false (req->wd == EIO_INVALID_WD))
2306 {
2307 req->result = -1;
2308 req->errorno = ENOENT;
2309 return;
2310 }
2311
2312 if (req->type >= EIO_OPEN)
2313 {
2314 #if HAVE_AT
2315 dirfd = WD2FD (req->wd);
2316 #else
2317 path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
2318 #endif
2319 }
2320
2086 switch (req->type) 2321 switch (req->type)
2087 { 2322 {
2323 case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
2324 req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
2325 break;
2326 case EIO_WD_CLOSE: req->result = 0;
2327 eio_wd_close_sync (req->wd); break;
2328
2329 case EIO_SEEK: eio__lseek (req); break;
2088 case EIO_READ: ALLOC (req->size); 2330 case EIO_READ: ALLOC (req->size);
2089 req->result = req->offs >= 0 2331 req->result = req->offs >= 0
2090 ? pread (req->int1, req->ptr2, req->size, req->offs) 2332 ? pread (req->int1, req->ptr2, req->size, req->offs)
2091 : read (req->int1, req->ptr2, req->size); break; 2333 : read (req->int1, req->ptr2, req->size); break;
2092 case EIO_WRITE: req->result = req->offs >= 0 2334 case EIO_WRITE: req->result = req->offs >= 0
… …
2094 : write (req->int1, req->ptr2, req->size); break; 2336 : write (req->int1, req->ptr2, req->size); break;
2095 2337
2096 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 2338 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; 2339 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
2098 2340
2341#if HAVE_AT
2342
2099 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2343 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2100 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2344 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
2101 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2345 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2346 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
2347 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
2348 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
2349 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
2350 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
2351
2352 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
2353 case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
2354 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
2355 case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
2356 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
2357 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
2358 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2359 case EIO_READLINK: ALLOC (PATH_MAX);
2360 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
2361 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2362 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2363 case EIO_UTIME:
2364 case EIO_FUTIME:
2365 {
2366 struct timespec ts[2];
2367 struct timespec *times;
2368
2369 if (req->nv1 != -1. || req->nv2 != -1.)
2370 {
2371 ts[0].tv_sec = req->nv1;
2372 ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
2373 ts[1].tv_sec = req->nv2;
2374 ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
2375
2376 times = ts;
2377 }
2378 else
2379 times = 0;
2380
2381 req->result = req->type == EIO_FUTIME
2382 ? futimens (req->int1, times)
2383 : utimensat (dirfd, req->ptr1, times, 0);
2384 }
2385 break;
2386
2387#else
2388
2389 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2390 req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2391 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2102 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2392 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2393 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
2394 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
2395 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
2396 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
2397
2398 case EIO_UNLINK: req->result = unlink (path ); break;
2399 case EIO_RMDIR: req->result = rmdir (path ); break;
2400 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
2401 case EIO_RENAME: req->result = rename (path , req->ptr2); break;
2402 case EIO_LINK: req->result = link (path , req->ptr2); break;
2403 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
2404 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
2405 case EIO_READLINK: ALLOC (PATH_MAX);
2406 req->result = readlink (path, req->ptr2, PATH_MAX); break;
2407 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2408 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
2409
2410 case EIO_UTIME:
2411 case EIO_FUTIME:
2412 {
2413 struct timeval tv[2];
2414 struct timeval *times;
2415
2416 if (req->nv1 != -1. || req->nv2 != -1.)
2417 {
2418 tv[0].tv_sec = req->nv1;
2419 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
2420 tv[1].tv_sec = req->nv2;
2421 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
2422
2423 times = tv;
2424 }
2425 else
2426 times = 0;
2427
2428 req->result = req->type == EIO_FUTIME
2429 ? futimes (req->int1, times)
2430 : utimes (req->ptr1, times);
2431 }
2432 break;
2433
2434#endif
2435
2436 case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
2437 {
2438 ALLOC (req->result);
2439 memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
2440 }
2441 break;
2442
2103 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2443 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2104 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 2444 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
2105 2445
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)); 2446 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2109 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 2447 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2110 2448
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; 2449 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; 2450 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; 2451 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2117 2452
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; 2453 case EIO_CLOSE: req->result = close (req->int1); break;
2120 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 2454 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; 2455 case EIO_SYNC: req->result = 0; sync (); break;
2135 case EIO_FSYNC: req->result = fsync (req->int1); break; 2456 case EIO_FSYNC: req->result = fsync (req->int1); break;
2136 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2457 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2137 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break; 2458 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; 2459 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); 2478 req->result = select (0, 0, 0, 0, &tv);
2158 } 2479 }
2159#endif 2480#endif
2160 break; 2481 break;
2161 2482
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: 2483 case EIO_GROUP:
2187 abort (); /* handled in eio_request */ 2484 abort (); /* handled in eio_request */
2188 2485
2189 case EIO_NOP: 2486 case EIO_NOP:
2190 req->result = 0; 2487 req->result = 0;
… …
2193 case EIO_CUSTOM: 2490 case EIO_CUSTOM:
2194 req->feed (req); 2491 req->feed (req);
2195 break; 2492 break;
2196 2493
2197 default: 2494 default:
2198 errno = ENOSYS;
2199 req->result = -1; 2495 req->result = EIO_ENOSYS ();
2200 break; 2496 break;
2201 } 2497 }
2202 2498
2203 req->errorno = errno; 2499 req->errorno = errno;
2204} 2500}
2205 2501
2206#ifndef EIO_NO_WRAPPERS 2502#ifndef EIO_NO_WRAPPERS
2207 2503
2504eio_req *eio_wd_open (const char *path, int pri, eio_cb cb, void *data)
2505{
2506 REQ (EIO_WD_OPEN); PATH; SEND;
2507}
2508
2509eio_req *eio_wd_close (eio_wd wd, int pri, eio_cb cb, void *data)
2510{
2511 REQ (EIO_WD_CLOSE); req->wd = wd; SEND;
2512}
2513
2208eio_req *eio_nop (int pri, eio_cb cb, void *data) 2514eio_req *eio_nop (int pri, eio_cb cb, void *data)
2209{ 2515{
2210 REQ (EIO_NOP); SEND; 2516 REQ (EIO_NOP); SEND;
2211} 2517}
2212 2518
… …
2271} 2577}
2272 2578
2273eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data) 2579eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data)
2274{ 2580{
2275 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND; 2581 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND;
2582}
2583
2584eio_req *eio_seek (int fd, off_t offset, int whence, int pri, eio_cb cb, void *data)
2585{
2586 REQ (EIO_SEEK); req->int1 = fd; req->offs = offset; req->int2 = whence; SEND;
2276} 2587}
2277 2588
2278eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data) 2589eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2279{ 2590{
2280 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND; 2591 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;

Diff Legend

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