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

Comparing libeio/eio.c (file contents):
Revision 1.50 by root, Thu Jan 7 17:18:08 2010 UTC vs.
Revision 1.56 by root, Sun Sep 12 03:36:28 2010 UTC

… …
49#include <stdlib.h> 49#include <stdlib.h>
50#include <string.h> 50#include <string.h>
51#include <errno.h> 51#include <errno.h>
52#include <sys/types.h> 52#include <sys/types.h>
53#include <sys/stat.h> 53#include <sys/stat.h>
54#include <sys/statvfs.h>
54#include <limits.h> 55#include <limits.h>
55#include <fcntl.h> 56#include <fcntl.h>
56#include <assert.h> 57#include <assert.h>
57 58
58#ifndef EIO_FINISH 59#ifndef EIO_FINISH
… …
73#else 74#else
74 75
75# include "config.h" 76# include "config.h"
76# include <sys/time.h> 77# include <sys/time.h>
77# include <sys/select.h> 78# include <sys/select.h>
78# include <sys/mman.h>
79# include <unistd.h> 79# include <unistd.h>
80# include <utime.h> 80# include <utime.h>
81# include <signal.h> 81# include <signal.h>
82# include <dirent.h> 82# include <dirent.h>
83
84#if _POSIX_MEMLOCK || _POSIX_MAPPED_FILES
85# include <sys/mman.h>
86#endif
83 87
84/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */ 88/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
85# if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 89# if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
86# define _DIRENT_HAVE_D_TYPE /* sigh */ 90# define _DIRENT_HAVE_D_TYPE /* sigh */
87# define D_INO(de) (de)->d_fileno 91# define D_INO(de) (de)->d_fileno
… …
136/* used for struct dirent, AIX doesn't provide it */ 140/* used for struct dirent, AIX doesn't provide it */
137#ifndef NAME_MAX 141#ifndef NAME_MAX
138# define NAME_MAX 4096 142# define NAME_MAX 4096
139#endif 143#endif
140 144
145/* used for readlink etc. */
146#ifndef PATH_MAX
147# define PATH_MAX 4096
148#endif
149
141/* buffer size for various temporary buffers */ 150/* buffer size for various temporary buffers */
142#define EIO_BUFSIZE 65536 151#define EIO_BUFSIZE 65536
143 152
144#define dBUF \ 153#define dBUF \
145 char *eio_buf; \ 154 char *eio_buf; \
… …
216static volatile unsigned int nreqs; /* reqlock */ 225static volatile unsigned int nreqs; /* reqlock */
217static volatile unsigned int nready; /* reqlock */ 226static volatile unsigned int nready; /* reqlock */
218static volatile unsigned int npending; /* reqlock */ 227static volatile unsigned int npending; /* reqlock */
219static volatile unsigned int max_idle = 4; 228static volatile unsigned int max_idle = 4;
220 229
221static mutex_t wrklock = X_MUTEX_INIT; 230static xmutex_t wrklock = X_MUTEX_INIT;
222static mutex_t reslock = X_MUTEX_INIT; 231static xmutex_t reslock = X_MUTEX_INIT;
223static mutex_t reqlock = X_MUTEX_INIT; 232static xmutex_t reqlock = X_MUTEX_INIT;
224static cond_t reqwait = X_COND_INIT; 233static xcond_t reqwait = X_COND_INIT;
225 234
226#if !HAVE_PREADWRITE 235#if !HAVE_PREADWRITE
227/* 236/*
228 * make our pread/pwrite emulation safe against themselves, but not against 237 * make our pread/pwrite emulation safe against themselves, but not against
229 * normal read/write by using a mutex. slows down execution a lot, 238 * normal read/write by using a mutex. slows down execution a lot,
230 * but that's your problem, not mine. 239 * but that's your problem, not mine.
231 */ 240 */
232static mutex_t preadwritelock = X_MUTEX_INIT; 241static xmutex_t preadwritelock = X_MUTEX_INIT;
233#endif 242#endif
234 243
235typedef struct etp_worker 244typedef struct etp_worker
236{ 245{
237 /* locked by wrklock */ 246 /* locked by wrklock */
238 struct etp_worker *prev, *next; 247 struct etp_worker *prev, *next;
239 248
240 thread_t tid; 249 xthread_t tid;
241 250
242 /* locked by reslock, reqlock or wrklock */ 251 /* locked by reslock, reqlock or wrklock */
243 ETP_REQ *req; /* currently processed request */ 252 ETP_REQ *req; /* currently processed request */
244 253
245 ETP_WORKER_COMMON 254 ETP_WORKER_COMMON
… …
918 */ 927 */
919 { 928 {
920 off_t sbytes; 929 off_t sbytes;
921 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 930 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
922 931
932 #if 0 /* according to the manpage, this is correct, but broken behaviour */
923 /* freebsd' sendfile will return 0 when success */ 933 /* freebsd' sendfile will return 0 on success */
924 if (res == 0 && sbytes) 934 /* freebsd 8 documents it as only setting *sbytes on EINTR and EAGAIN, but */
925 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */ 935 /* not on e.g. EIO or EPIPE - sounds broken */
936 if ((res < 0 && (errno == EAGAIN || errno == EINTR) && sbytes) || res == 0)
937 res = sbytes;
938 #endif
939
940 /* according to source inspection, this is correct, and useful behaviour */
941 if (sbytes)
926 res = sbytes; 942 res = sbytes;
927 } 943 }
928 944
929# elif defined (__APPLE__) 945# elif defined (__APPLE__)
930 946
931 { 947 {
932 off_t sbytes = count; 948 off_t sbytes = count;
933 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 949 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
934 950
935 if (res == 0 && errno == EAGAIN && sbytes) 951 /* according to the manpage, sbytes is always valid */
952 if (sbytes)
936 res = sbytes; 953 res = sbytes;
937 } 954 }
938 955
939# elif __hpux 956# elif __hpux
940 res = sendfile (ofd, ifd, offset, count, 0, 0); 957 res = sendfile (ofd, ifd, offset, count, 0, 0);
… …
1378 break; 1395 break;
1379 } 1396 }
1380 } 1397 }
1381} 1398}
1382 1399
1400#ifdef PAGESIZE
1401# define eio_pagesize() PAGESIZE
1402#else
1403static intptr_t
1404eio_pagesize (void)
1405{
1406 static intptr_t page;
1407
1408 if (!page)
1409 page = sysconf (_SC_PAGESIZE);
1410
1411 return page;
1412}
1413#endif
1414
1415static void
1416eio_page_align (void **addr, size_t *length)
1417{
1418 intptr_t mask = eio_pagesize () - 1;
1419
1420 /* round down addr */
1421 intptr_t adj = mask & (intptr_t)*addr;
1422
1423 *addr = (void *)((intptr_t)*addr - adj);
1424 *length += adj;
1425
1426 /* round up length */
1427 *length = (*length + mask) & ~mask;
1428}
1429
1430#if !_POSIX_MEMLOCK
1431# define eio__mlock(a,b) ((errno = ENOSYS), -1)
1432# define eio__mlockall(a) ((errno = ENOSYS), -1)
1433#else
1434
1435static int
1436eio__mlock (void *addr, size_t length)
1437{
1438 eio_page_align (&addr, &length);
1439
1440 mlock (addr, length);
1441}
1442
1443static int
1444eio__mlockall (int flags)
1445{
1446 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1447 extern int mallopt (int, int);
1448 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1449 #endif
1450
1451 if (EIO_MCL_CURRENT != MCL_CURRENT
1452 || EIO_MCL_FUTURE != MCL_FUTURE)
1453 {
1454 flags = 0
1455 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
1456 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
1457 }
1458
1459 mlockall (flags);
1460}
1461#endif
1462
1383#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 1463#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1384# define eio__msync(a,b,c) ((errno = ENOSYS), -1) 1464# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
1385#else 1465#else
1386 1466
1387int 1467int
1388eio__msync (void *mem, size_t len, int flags) 1468eio__msync (void *mem, size_t len, int flags)
1389{ 1469{
1470 eio_page_align (&mem, &len);
1471
1390 if (EIO_MS_ASYNC != MS_SYNC 1472 if (EIO_MS_ASYNC != MS_SYNC
1391 || EIO_MS_INVALIDATE != MS_INVALIDATE 1473 || EIO_MS_INVALIDATE != MS_INVALIDATE
1392 || EIO_MS_SYNC != MS_SYNC) 1474 || EIO_MS_SYNC != MS_SYNC)
1393 { 1475 {
1394 flags = 0 1476 flags = 0
… …
1403#endif 1485#endif
1404 1486
1405int 1487int
1406eio__mtouch (void *mem, size_t len, int flags) 1488eio__mtouch (void *mem, size_t len, int flags)
1407{ 1489{
1490 eio_page_align (&mem, &len);
1491
1492 {
1408 intptr_t addr = (intptr_t)mem; 1493 intptr_t addr = (intptr_t)mem;
1409 intptr_t end = addr + len; 1494 intptr_t end = addr + len;
1410#ifdef PAGESIZE 1495 intptr_t page = eio_pagesize ();
1411 const intptr_t page = PAGESIZE;
1412#else
1413 static intptr_t page;
1414 1496
1415 if (!page)
1416 page = sysconf (_SC_PAGESIZE);
1417#endif
1418
1419 /* round down to start of page, although this is probably useless */
1420 addr &= ~(page - 1); /* assume page size is always a power of two */
1421
1422 if (addr < end) 1497 if (addr < end)
1423 if (flags & EIO_MT_MODIFY) /* modify */ 1498 if (flags & EIO_MT_MODIFY) /* modify */
1424 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len); 1499 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len);
1425 else 1500 else
1426 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len); 1501 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len);
1502 }
1427 1503
1428 return 0; 1504 return 0;
1429} 1505}
1430 1506
1431/*****************************************************************************/ 1507/*****************************************************************************/
… …
1576 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1652 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1577 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 1653 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1578 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1654 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1579 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 1655 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1580 1656
1657 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1658 req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1659 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1660 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1661
1581 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break; 1662 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1582 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break; 1663 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1583 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break; 1664 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
1584 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break; 1665 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
1585 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break; 1666 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
… …
1594 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break; 1675 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1595 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break; 1676 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1596 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break; 1677 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1597 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->int3); break; 1678 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->int3); break;
1598 1679
1599 case EIO_READLINK: ALLOC (NAME_MAX); 1680 case EIO_READLINK: ALLOC (PATH_MAX);
1600 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break; 1681 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1601 1682
1602 case EIO_SYNC: req->result = 0; sync (); break; 1683 case EIO_SYNC: req->result = 0; sync (); break;
1603 case EIO_FSYNC: req->result = fsync (req->int1); break; 1684 case EIO_FSYNC: req->result = fsync (req->int1); break;
1604 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 1685 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1605 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break; 1686 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
1606 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break; 1687 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;
1688 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
1689 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
1607 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break; 1690 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1608 1691
1609 case EIO_READDIR: eio__scandir (req, self); break; 1692 case EIO_READDIR: eio__scandir (req, self); break;
1610 1693
1611 case EIO_BUSY: 1694 case EIO_BUSY:
… …
1697eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 1780eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1698{ 1781{
1699 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 1782 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1700} 1783}
1701 1784
1785eio_req *eio_mlock (void *addr, size_t length, int pri, eio_cb cb, void *data)
1786{
1787 REQ (EIO_MLOCK); req->ptr2 = addr; req->size = length; SEND;
1788}
1789
1790eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
1791{
1792 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
1793}
1794
1702eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data) 1795eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
1703{ 1796{
1704 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND; 1797 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
1705} 1798}
1706 1799
… …
1730} 1823}
1731 1824
1732eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data) 1825eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data)
1733{ 1826{
1734 REQ (EIO_FSTAT); req->int1 = fd; SEND; 1827 REQ (EIO_FSTAT); req->int1 = fd; SEND;
1828}
1829
1830eio_req *eio_fstatvfs (int fd, int pri, eio_cb cb, void *data)
1831{
1832 REQ (EIO_FSTATVFS); req->int1 = fd; SEND;
1735} 1833}
1736 1834
1737eio_req *eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void *data) 1835eio_req *eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void *data)
1738{ 1836{
1739 REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND; 1837 REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND;
… …
1811} 1909}
1812 1910
1813eio_req *eio_lstat (const char *path, int pri, eio_cb cb, void *data) 1911eio_req *eio_lstat (const char *path, int pri, eio_cb cb, void *data)
1814{ 1912{
1815 return eio__1path (EIO_LSTAT, path, pri, cb, data); 1913 return eio__1path (EIO_LSTAT, path, pri, cb, data);
1914}
1915
1916eio_req *eio_statvfs (const char *path, int pri, eio_cb cb, void *data)
1917{
1918 return eio__1path (EIO_STATVFS, path, pri, cb, data);
1816} 1919}
1817 1920
1818eio_req *eio_unlink (const char *path, int pri, eio_cb cb, void *data) 1921eio_req *eio_unlink (const char *path, int pri, eio_cb cb, void *data)
1819{ 1922{
1820 return eio__1path (EIO_UNLINK, path, pri, cb, data); 1923 return eio__1path (EIO_UNLINK, path, pri, cb, data);

Diff Legend

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