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.119 by root, Tue Apr 10 05:01:34 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>
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))
205 #endif 208 #endif
206 209
207 #define D_NAME(entp) entp->d_name 210 #define D_NAME(entp) entp->d_name
208 211
209 /* 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 */
210 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 213 #if __FreeBSD__ || __NetBSD__ || __OpenBSD__
211 #define _DIRENT_HAVE_D_TYPE /* sigh */ 214 #define _DIRENT_HAVE_D_TYPE /* sigh */
212 #define D_INO(de) (de)->d_fileno 215 #define D_INO(de) (de)->d_fileno
213 #define D_NAMLEN(de) (de)->d_namlen 216 #define D_NAMLEN(de) (de)->d_namlen
214 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600 217 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
215 #define D_INO(de) (de)->d_ino 218 #define D_INO(de) (de)->d_ino
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);
984 int res; 1032 int res;
985 1033
986#if HAVE_SYS_SYNCFS 1034#if HAVE_SYS_SYNCFS
987 res = (int)syscall (__NR_syncfs, (int)(fd)); 1035 res = (int)syscall (__NR_syncfs, (int)(fd));
988#else 1036#else
989 res = -1; 1037 res = EIO_ENOSYS ();
990 errno = ENOSYS;
991#endif 1038#endif
992 1039
993 if (res < 0 && errno == ENOSYS && fd >= 0) 1040 if (res < 0 && errno == ENOSYS && fd >= 0)
994 sync (); 1041 sync ();
995 1042
1025} 1072}
1026 1073
1027static int 1074static int
1028eio__fallocate (int fd, int mode, off_t offset, size_t len) 1075eio__fallocate (int fd, int mode, off_t offset, size_t len)
1029{ 1076{
1030#if HAVE_FALLOCATE 1077#if HAVE_LINUX_FALLOCATE
1031 return fallocate (fd, mode, offset, len); 1078 return fallocate (fd, mode, offset, len);
1032#else 1079#else
1033 errno = ENOSYS; 1080 return EIO_ENOSYS ();
1034 return -1;
1035#endif 1081#endif
1036} 1082}
1037 1083
1038#if !HAVE_READAHEAD 1084#if !HAVE_READAHEAD
1039# undef readahead 1085# undef readahead
1054 todo -= len; 1100 todo -= len;
1055 } 1101 }
1056 1102
1057 FUBd; 1103 FUBd;
1058 1104
1059 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 */
1060 return count; 1107 return 0;
1061} 1108}
1062 1109
1063#endif 1110#endif
1064 1111
1065/* sendfile always needs emulation */ 1112/* sendfile always needs emulation */
1100 1147
1101 /* according to source inspection, this is correct, and useful behaviour */ 1148 /* according to source inspection, this is correct, and useful behaviour */
1102 if (sbytes) 1149 if (sbytes)
1103 res = sbytes; 1150 res = sbytes;
1104 1151
1105# elif defined (__APPLE__) 1152# elif defined __APPLE__
1106 off_t sbytes = count; 1153 off_t sbytes = count;
1107 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 1154 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1108 1155
1109 /* according to the manpage, sbytes is always valid */ 1156 /* according to the manpage, sbytes is always valid */
1110 if (sbytes) 1157 if (sbytes)
1137 HANDLE h = TO_SOCKET (ifd); 1184 HANDLE h = TO_SOCKET (ifd);
1138 SetFilePointer (h, offset, 0, FILE_BEGIN); 1185 SetFilePointer (h, offset, 0, FILE_BEGIN);
1139 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0); 1186 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1140 1187
1141#else 1188#else
1142 res = -1; 1189 res = EIO_ENOSYS ();
1143 errno = ENOSYS;
1144#endif 1190#endif
1145 1191
1146 /* we assume sendfile can copy at least 128mb in one go */ 1192 /* we assume sendfile can copy at least 128mb in one go */
1147 if (res <= 128 * 1024 * 1024) 1193 if (res <= 128 * 1024 * 1024)
1148 { 1194 {
1335 1381
1336/*****************************************************************************/ 1382/*****************************************************************************/
1337/* requests implemented outside eio_execute, because they are so large */ 1383/* requests implemented outside eio_execute, because they are so large */
1338 1384
1339static void 1385static void
1340eio__realpath (eio_req *req, etp_worker *self) 1386eio__lseek (eio_req *req)
1341{ 1387{
1342 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;
1343 char *res; 1404 char *res;
1344 char *tmp1, *tmp2; 1405 char *tmp1, *tmp2;
1345#if SYMLOOP_MAX > 32 1406#if SYMLOOP_MAX > 32
1346 int symlinks = SYMLOOP_MAX; 1407 int symlinks = SYMLOOP_MAX;
1347#else 1408#else
1348 int symlinks = 32; 1409 int symlinks = 32;
1349#endif 1410#endif
1350 1411
1351 req->result = -1;
1352
1353 errno = EINVAL; 1412 errno = EINVAL;
1354 if (!rel) 1413 if (!rel)
1355 return; 1414 return -1;
1356 1415
1357 errno = ENOENT; 1416 errno = ENOENT;
1358 if (!*rel) 1417 if (!*rel)
1359 return; 1418 return -1;
1360 1419
1361 if (!req->ptr2) 1420 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; 1421 tmp1 = res + PATH_MAX;
1375 tmp2 = tmp1 + PATH_MAX; 1422 tmp2 = tmp1 + PATH_MAX;
1376 1423
1377#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 */
1378#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1425#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1397#endif 1444#endif
1398#endif 1445#endif
1399 1446
1400 if (*rel != '/') 1447 if (*rel != '/')
1401 { 1448 {
1449 int len;
1450
1451 errno = ENOENT;
1452 if (wd == EIO_INVALID_WD)
1453 return -1;
1454
1455 if (wd == EIO_CWD)
1456 {
1402 if (!getcwd (res, PATH_MAX)) 1457 if (!getcwd (res, PATH_MAX))
1403 return; 1458 return -1;
1459
1460 len = strlen (res);
1461 }
1462 else
1463 memcpy (res, wd->str, len = wd->len);
1404 1464
1405 if (res [1]) /* only use if not / */ 1465 if (res [1]) /* only use if not / */
1406 res += strlen (res); 1466 res += len;
1407 } 1467 }
1408 1468
1409 while (*rel) 1469 while (*rel)
1410 { 1470 {
1411 eio_ssize_t len, linklen; 1471 eio_ssize_t len, linklen;
1412 char *beg = rel; 1472 const char *beg = rel;
1413 1473
1414 while (*rel && *rel != '/') 1474 while (*rel && *rel != '/')
1415 ++rel; 1475 ++rel;
1416 1476
1417 len = rel - beg; 1477 len = rel - beg;
1429 1489
1430 if (beg [1] == '.' && len == 2) 1490 if (beg [1] == '.' && len == 2)
1431 { 1491 {
1432 /* .. - back up one component, if possible */ 1492 /* .. - back up one component, if possible */
1433 1493
1434 while (res != req->ptr2) 1494 while (res != tmpbuf->ptr)
1435 if (*--res == '/') 1495 if (*--res == '/')
1436 break; 1496 break;
1437 1497
1438 continue; 1498 continue;
1439 } 1499 }
1440 } 1500 }
1441 1501
1442 errno = ENAMETOOLONG; 1502 errno = ENAMETOOLONG;
1443 if (res + 1 + len + 1 >= tmp1) 1503 if (res + 1 + len + 1 >= tmp1)
1444 return; 1504 return -1;
1445 1505
1446 /* copy one component */ 1506 /* copy one component */
1447 *res = '/'; 1507 *res = '/';
1448 memcpy (res + 1, beg, len); 1508 memcpy (res + 1, beg, len);
1449 1509
1450 /* zero-terminate, for readlink */ 1510 /* zero-terminate, for readlink */
1451 res [len + 1] = 0; 1511 res [len + 1] = 0;
1452 1512
1453 /* now check if it's a symlink */ 1513 /* now check if it's a symlink */
1454 linklen = readlink (req->ptr2, tmp1, PATH_MAX); 1514 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1455 1515
1456 if (linklen < 0) 1516 if (linklen < 0)
1457 { 1517 {
1458 if (errno != EINVAL) 1518 if (errno != EINVAL)
1459 return; 1519 return -1;
1460 1520
1461 /* it's a normal directory. hopefully */ 1521 /* it's a normal directory. hopefully */
1462 res += len + 1; 1522 res += len + 1;
1463 } 1523 }
1464 else 1524 else
1466 /* yay, it was a symlink - build new path in tmp2 */ 1526 /* yay, it was a symlink - build new path in tmp2 */
1467 int rellen = strlen (rel); 1527 int rellen = strlen (rel);
1468 1528
1469 errno = ENAMETOOLONG; 1529 errno = ENAMETOOLONG;
1470 if (linklen + 1 + rellen >= PATH_MAX) 1530 if (linklen + 1 + rellen >= PATH_MAX)
1471 return; 1531 return -1;
1472 1532
1473 errno = ELOOP; 1533 errno = ELOOP;
1474 if (!--symlinks) 1534 if (!--symlinks)
1475 return; 1535 return -1;
1476 1536
1477 if (*tmp1 == '/') 1537 if (*tmp1 == '/')
1478 res = req->ptr2; /* symlink resolves to an absolute path */ 1538 res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1479 1539
1480 /* 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 */
1481 memmove (tmp2 + linklen + 1, rel, rellen + 1); 1541 memmove (tmp2 + linklen + 1, rel, rellen + 1);
1482 tmp2 [linklen] = '/'; 1542 tmp2 [linklen] = '/';
1483 memcpy (tmp2, tmp1, linklen); 1543 memcpy (tmp2, tmp1, linklen);
1485 rel = tmp2; 1545 rel = tmp2;
1486 } 1546 }
1487 } 1547 }
1488 1548
1489 /* special case for the lone root path */ 1549 /* special case for the lone root path */
1490 if (res == req->ptr2) 1550 if (res == tmpbuf->ptr)
1491 *res++ = '/'; 1551 *res++ = '/';
1492 1552
1493 req->result = res - (char *)req->ptr2; 1553 return res - (char *)tmpbuf->ptr;
1494
1495done:
1496 req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1497} 1554}
1498 1555
1499static signed char 1556static signed char
1500eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1557eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1501{ 1558{
1689#ifdef _WIN32 1746#ifdef _WIN32
1690 { 1747 {
1691 int len = strlen ((const char *)req->ptr1); 1748 int len = strlen ((const char *)req->ptr1);
1692 char *path = malloc (MAX_PATH); 1749 char *path = malloc (MAX_PATH);
1693 const char *fmt; 1750 const char *fmt;
1751 const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1694 1752
1695 if (!len) 1753 if (!len)
1696 fmt = "./*"; 1754 fmt = "./*";
1697 else if (((const char *)req->ptr1)[len - 1] == '/' || ((const char *)req->ptr1)[len - 1] == '\\') 1755 else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1698 fmt = "%s*"; 1756 fmt = "%s*";
1699 else 1757 else
1700 fmt = "%s/*"; 1758 fmt = "%s/*";
1701 1759
1702 _snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1); 1760 _snprintf (path, MAX_PATH, fmt, reqpath);
1703 dirp = FindFirstFile (path, &entp); 1761 dirp = FindFirstFile (path, &entp);
1704 free (path); 1762 free (path);
1705 1763
1706 if (dirp == INVALID_HANDLE_VALUE) 1764 if (dirp == INVALID_HANDLE_VALUE)
1707 { 1765 {
1708 dirp = 0;
1709
1710 /* should steal _dosmaperr */ 1766 /* should steal _dosmaperr */
1711 switch (GetLastError ()) 1767 switch (GetLastError ())
1712 { 1768 {
1713 case ERROR_FILE_NOT_FOUND: 1769 case ERROR_FILE_NOT_FOUND:
1714 req->result = 0; 1770 req->result = 0;
1715 break; 1771 break;
1716 1772
1717 case ERROR_INVALID_NAME: 1773 case ERROR_INVALID_NAME:
1718 case ERROR_PATH_NOT_FOUND: 1774 case ERROR_PATH_NOT_FOUND:
1719 case ERROR_NO_MORE_FILES: 1775 case ERROR_NO_MORE_FILES:
1720 errno = ENOENT; 1776 errno = ENOENT;
1721 break; 1777 break;
1722 1778
1723 case ERROR_NOT_ENOUGH_MEMORY: 1779 case ERROR_NOT_ENOUGH_MEMORY:
1724 errno = ENOMEM; 1780 errno = ENOMEM;
1725 break; 1781 break;
1726 1782
1727 default: 1783 default:
1728 errno = EINVAL; 1784 errno = EINVAL;
1729 break; 1785 break;
1730 } 1786 }
1787
1788 return;
1731 } 1789 }
1732 } 1790 }
1733#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
1734 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;
1735#endif 1813#endif
1736 1814
1737 if (req->flags & EIO_FLAG_PTR1_FREE) 1815 if (req->flags & EIO_FLAG_PTR1_FREE)
1738 free (req->ptr1); 1816 free (req->ptr1);
1739 1817
1740 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1818 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1741 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1819 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1742 req->ptr2 = names = malloc (namesalloc); 1820 req->ptr2 = names = malloc (namesalloc);
1743 1821
1744 if (dirp && names && (!flags || dents)) 1822 if (!names || (flags && !dents))
1823 return;
1824
1745 for (;;) 1825 for (;;)
1746 { 1826 {
1747 int done; 1827 int done;
1748 1828
1749#ifdef _WIN32 1829#ifdef _WIN32
1750 done = !dirp; 1830 done = !dirp;
1751#else 1831#else
1752 errno = 0; 1832 errno = 0;
1753 entp = readdir (dirp); 1833 entp = readdir (dirp);
1754 done = !entp; 1834 done = !entp;
1755#endif 1835#endif
1756 1836
1757 if (done) 1837 if (done)
1758 { 1838 {
1759#ifndef _WIN32 1839#ifndef _WIN32
1760 int old_errno = errno; 1840 int old_errno = errno;
1761 closedir (dirp); 1841 closedir (dirp);
1762 errno = old_errno; 1842 errno = old_errno;
1763 1843
1764 if (errno) 1844 if (errno)
1765 break; 1845 break;
1766#endif 1846#endif
1767 1847
1768 /* sort etc. */ 1848 /* sort etc. */
1769 req->int1 = flags; 1849 req->int1 = flags;
1770 req->result = dentoffs; 1850 req->result = dentoffs;
1771 1851
1772 if (flags & EIO_READDIR_STAT_ORDER) 1852 if (flags & EIO_READDIR_STAT_ORDER)
1773 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);
1774 else if (flags & EIO_READDIR_DIRS_FIRST) 1854 else if (flags & EIO_READDIR_DIRS_FIRST)
1775 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1855 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1776 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 */
1777 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))
1778 { 1908 {
1779 /* 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
1780 eio_dirent *oth = dents + dentoffs; 1916 ent = dents + dentoffs;
1781 eio_dirent *dir = dents;
1782 1917
1783 /* 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 */
1784 /* by walking from both sides and swapping if necessary */ 1919 ent->namelen = len - 1;
1785 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)
1786 { 1980 {
1787 if (dir->type == EIO_DT_DIR) 1981 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1788 ++dir; 1982 ent->score = 1;
1789 else if ((--oth)->type == EIO_DT_DIR) 1983 else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1790 { 1984 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 } 1985 }
1796 1986 else if (ent->type == EIO_DT_DIR)
1797 /* now sort the dirs only (dirs all have the same score) */ 1987 ent->score = 0;
1798 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1799 } 1988 }
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 } 1989 }
1820 1990
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; 1991 namesoffs += len;
1912 ++dentoffs; 1992 ++dentoffs;
1913 } 1993 }
1914 1994
1915 if (EIO_CANCELLED (req)) 1995 if (EIO_CANCELLED (req))
1916 { 1996 {
1917 errno = ECANCELED; 1997 errno = ECANCELED;
1918 break; 1998 break;
1919 } 1999 }
1920 2000
1921#ifdef _WIN32 2001#ifdef _WIN32
1922 if (!FindNextFile (dirp, &entp)) 2002 if (!FindNextFile (dirp, &entp))
1923 { 2003 {
1924 FindClose (dirp); 2004 FindClose (dirp);
1925 dirp = 0; 2005 dirp = 0;
1926 } 2006 }
1927#endif 2007#endif
1928 } 2008 }
1929} 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
1930 2132
1931/*****************************************************************************/ 2133/*****************************************************************************/
1932 2134
1933#define ALLOC(len) \ 2135#define ALLOC(len) \
1934 if (!req->ptr2) \ 2136 if (!req->ptr2) \
1943 req->result = -1; \ 2145 req->result = -1; \
1944 break; \ 2146 break; \
1945 } \ 2147 } \
1946 } 2148 }
1947 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
1948X_THREAD_PROC (etp_proc) 2167X_THREAD_PROC (etp_proc)
1949{ 2168{
1950 ETP_REQ *req; 2169 ETP_REQ *req;
1951 struct timespec ts; 2170 struct timespec ts;
1952 etp_worker *self = (etp_worker *)thr_arg; 2171 etp_worker *self = (etp_worker *)thr_arg;
1953 2172
1954#if HAVE_PRCTL_SET_NAME 2173 etp_proc_init ();
1955 prctl (PR_SET_NAME, (unsigned long)"eio_thread", 0, 0, 0);
1956#endif
1957 2174
1958 /* try to distribute timeouts somewhat evenly */ 2175 /* try to distribute timeouts somewhat evenly */
1959 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 2176 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1960 2177
1961 for (;;) 2178 for (;;)
1964 2181
1965 X_LOCK (reqlock); 2182 X_LOCK (reqlock);
1966 2183
1967 for (;;) 2184 for (;;)
1968 { 2185 {
1969 self->req = req = reqq_shift (&req_queue); 2186 req = reqq_shift (&req_queue);
1970 2187
1971 if (req) 2188 if (req)
1972 break; 2189 break;
1973 2190
1974 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 */
2012 ++npending; 2229 ++npending;
2013 2230
2014 if (!reqq_push (&res_queue, req) && want_poll_cb) 2231 if (!reqq_push (&res_queue, req) && want_poll_cb)
2015 want_poll_cb (); 2232 want_poll_cb ();
2016 2233
2017 self->req = 0;
2018 etp_worker_clear (self); 2234 etp_worker_clear (self);
2019 2235
2020 X_UNLOCK (reslock); 2236 X_UNLOCK (reslock);
2021 } 2237 }
2022 2238
2023quit: 2239quit:
2240 free (req);
2241
2024 X_LOCK (wrklock); 2242 X_LOCK (wrklock);
2025 etp_worker_free (self); 2243 etp_worker_free (self);
2026 X_UNLOCK (wrklock); 2244 X_UNLOCK (wrklock);
2027 2245
2028 return 0; 2246 return 0;
2071 } 2289 }
2072 2290
2073static void 2291static void
2074eio_execute (etp_worker *self, eio_req *req) 2292eio_execute (etp_worker *self, eio_req *req)
2075{ 2293{
2294#if HAVE_AT
2295 int dirfd;
2296#else
2297 const char *path;
2298#endif
2299
2076 if (ecb_expect_false (EIO_CANCELLED (req))) 2300 if (ecb_expect_false (EIO_CANCELLED (req)))
2077 { 2301 {
2078 req->result = -1; 2302 req->result = -1;
2079 req->errorno = ECANCELED; 2303 req->errorno = ECANCELED;
2080 return; 2304 return;
2081 } 2305 }
2082 2306
2307 if (ecb_expect_false (req->wd == EIO_INVALID_WD))
2308 {
2309 req->result = -1;
2310 req->errorno = ENOENT;
2311 return;
2312 }
2313
2314 if (req->type >= EIO_OPEN)
2315 {
2316 #if HAVE_AT
2317 dirfd = WD2FD (req->wd);
2318 #else
2319 path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
2320 #endif
2321 }
2322
2083 switch (req->type) 2323 switch (req->type)
2084 { 2324 {
2325 case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
2326 req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
2327 break;
2328 case EIO_WD_CLOSE: req->result = 0;
2329 eio_wd_close_sync (req->wd); break;
2330
2331 case EIO_SEEK: eio__lseek (req); break;
2085 case EIO_READ: ALLOC (req->size); 2332 case EIO_READ: ALLOC (req->size);
2086 req->result = req->offs >= 0 2333 req->result = req->offs >= 0
2087 ? pread (req->int1, req->ptr2, req->size, req->offs) 2334 ? pread (req->int1, req->ptr2, req->size, req->offs)
2088 : read (req->int1, req->ptr2, req->size); break; 2335 : read (req->int1, req->ptr2, req->size); break;
2089 case EIO_WRITE: req->result = req->offs >= 0 2336 case EIO_WRITE: req->result = req->offs >= 0
2091 : write (req->int1, req->ptr2, req->size); break; 2338 : write (req->int1, req->ptr2, req->size); break;
2092 2339
2093 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 2340 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; 2341 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
2095 2342
2343#if HAVE_AT
2344
2096 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2345 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2097 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2346 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
2098 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2347 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2348 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
2349 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
2350 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
2351 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
2352 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
2353
2354 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
2355 case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
2356 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
2357 case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
2358 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
2359 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
2360 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2361 case EIO_READLINK: ALLOC (PATH_MAX);
2362 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
2363 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2364 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2365 case EIO_UTIME:
2366 case EIO_FUTIME:
2367 {
2368 struct timespec ts[2];
2369 struct timespec *times;
2370
2371 if (req->nv1 != -1. || req->nv2 != -1.)
2372 {
2373 ts[0].tv_sec = req->nv1;
2374 ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
2375 ts[1].tv_sec = req->nv2;
2376 ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
2377
2378 times = ts;
2379 }
2380 else
2381 times = 0;
2382
2383 req->result = req->type == EIO_FUTIME
2384 ? futimens (req->int1, times)
2385 : utimensat (dirfd, req->ptr1, times, 0);
2386 }
2387 break;
2388
2389#else
2390
2391 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2392 req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2393 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2099 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2394 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2395 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
2396 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
2397 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
2398 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
2399
2400 case EIO_UNLINK: req->result = unlink (path ); break;
2401 case EIO_RMDIR: req->result = rmdir (path ); break;
2402 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
2403 case EIO_RENAME: req->result = rename (path , req->ptr2); break;
2404 case EIO_LINK: req->result = link (path , req->ptr2); break;
2405 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
2406 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
2407 case EIO_READLINK: ALLOC (PATH_MAX);
2408 req->result = readlink (path, req->ptr2, PATH_MAX); break;
2409 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2410 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
2411
2412 case EIO_UTIME:
2413 case EIO_FUTIME:
2414 {
2415 struct timeval tv[2];
2416 struct timeval *times;
2417
2418 if (req->nv1 != -1. || req->nv2 != -1.)
2419 {
2420 tv[0].tv_sec = req->nv1;
2421 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
2422 tv[1].tv_sec = req->nv2;
2423 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
2424
2425 times = tv;
2426 }
2427 else
2428 times = 0;
2429
2430 req->result = req->type == EIO_FUTIME
2431 ? futimes (req->int1, times)
2432 : utimes (req->ptr1, times);
2433 }
2434 break;
2435
2436#endif
2437
2438 case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
2439 {
2440 ALLOC (req->result);
2441 memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
2442 }
2443 break;
2444
2100 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2445 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2101 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 2446 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
2102 2447
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)); 2448 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2106 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 2449 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2107 2450
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; 2451 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; 2452 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; 2453 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2114 2454
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; 2455 case EIO_CLOSE: req->result = close (req->int1); break;
2117 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 2456 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; 2457 case EIO_SYNC: req->result = 0; sync (); break;
2132 case EIO_FSYNC: req->result = fsync (req->int1); break; 2458 case EIO_FSYNC: req->result = fsync (req->int1); break;
2133 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2459 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2134 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break; 2460 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; 2461 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); 2480 req->result = select (0, 0, 0, 0, &tv);
2155 } 2481 }
2156#endif 2482#endif
2157 break; 2483 break;
2158 2484
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: 2485 case EIO_GROUP:
2184 abort (); /* handled in eio_request */ 2486 abort (); /* handled in eio_request */
2185 2487
2186 case EIO_NOP: 2488 case EIO_NOP:
2187 req->result = 0; 2489 req->result = 0;
2190 case EIO_CUSTOM: 2492 case EIO_CUSTOM:
2191 req->feed (req); 2493 req->feed (req);
2192 break; 2494 break;
2193 2495
2194 default: 2496 default:
2195 errno = ENOSYS;
2196 req->result = -1; 2497 req->result = EIO_ENOSYS ();
2197 break; 2498 break;
2198 } 2499 }
2199 2500
2200 req->errorno = errno; 2501 req->errorno = errno;
2201} 2502}
2202 2503
2203#ifndef EIO_NO_WRAPPERS 2504#ifndef EIO_NO_WRAPPERS
2204 2505
2506eio_req *eio_wd_open (const char *path, int pri, eio_cb cb, void *data)
2507{
2508 REQ (EIO_WD_OPEN); PATH; SEND;
2509}
2510
2511eio_req *eio_wd_close (eio_wd wd, int pri, eio_cb cb, void *data)
2512{
2513 REQ (EIO_WD_CLOSE); req->wd = wd; SEND;
2514}
2515
2205eio_req *eio_nop (int pri, eio_cb cb, void *data) 2516eio_req *eio_nop (int pri, eio_cb cb, void *data)
2206{ 2517{
2207 REQ (EIO_NOP); SEND; 2518 REQ (EIO_NOP); SEND;
2208} 2519}
2209 2520
2268} 2579}
2269 2580
2270eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data) 2581eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data)
2271{ 2582{
2272 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND; 2583 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND;
2584}
2585
2586eio_req *eio_seek (int fd, off_t offset, int whence, int pri, eio_cb cb, void *data)
2587{
2588 REQ (EIO_SEEK); req->int1 = fd; req->offs = offset; req->int2 = whence; SEND;
2273} 2589}
2274 2590
2275eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data) 2591eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2276{ 2592{
2277 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND; 2593 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