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

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.55 by root, Wed Mar 31 00:46:18 2010 UTC vs.
Revision 1.59 by root, Wed Dec 1 07:30:39 2010 UTC

… …
74#else 74#else
75 75
76# include "config.h" 76# include "config.h"
77# include <sys/time.h> 77# include <sys/time.h>
78# include <sys/select.h> 78# include <sys/select.h>
79# include <sys/mman.h>
80# include <unistd.h> 79# include <unistd.h>
81# include <utime.h> 80# include <utime.h>
82# include <signal.h> 81# include <signal.h>
83# include <dirent.h> 82# include <dirent.h>
83
84#if _POSIX_MEMLOCK || _POSIX_MAPPED_FILES
85# include <sys/mman.h>
86#endif
84 87
85/* 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 */
86# if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 89# if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
87# define _DIRENT_HAVE_D_TYPE /* sigh */ 90# define _DIRENT_HAVE_D_TYPE /* sigh */
88# define D_INO(de) (de)->d_fileno 91# define D_INO(de) (de)->d_fileno
… …
813 816
814 return res; 817 return res;
815} 818}
816#endif 819#endif
817 820
818#ifndef HAVE_FUTIMES 821#ifndef HAVE_UTIMES
819 822
820# undef utimes 823# undef utimes
821# undef futimes
822# define utimes(path,times) eio__utimes (path, times) 824# define utimes(path,times) eio__utimes (path, times)
823# define futimes(fd,times) eio__futimes (fd, times)
824 825
825static int 826static int
826eio__utimes (const char *filename, const struct timeval times[2]) 827eio__utimes (const char *filename, const struct timeval times[2])
827{ 828{
828 if (times) 829 if (times)
… …
835 return utime (filename, &buf); 836 return utime (filename, &buf);
836 } 837 }
837 else 838 else
838 return utime (filename, 0); 839 return utime (filename, 0);
839} 840}
841
842#endif
843
844#ifndef HAVE_FUTIMES
845
846# undef futimes
847# define futimes(fd,times) eio__futimes (fd, times)
840 848
841static int eio__futimes (int fd, const struct timeval tv[2]) 849static int eio__futimes (int fd, const struct timeval tv[2])
842{ 850{
843 errno = ENOSYS; 851 errno = ENOSYS;
844 return -1; 852 return -1;
… …
1392 break; 1400 break;
1393 } 1401 }
1394 } 1402 }
1395} 1403}
1396 1404
1405#ifdef PAGESIZE
1406# define eio_pagesize() PAGESIZE
1407#else
1408static intptr_t
1409eio_pagesize (void)
1410{
1411 static intptr_t page;
1412
1413 if (!page)
1414 page = sysconf (_SC_PAGESIZE);
1415
1416 return page;
1417}
1418#endif
1419
1420static void
1421eio_page_align (void **addr, size_t *length)
1422{
1423 intptr_t mask = eio_pagesize () - 1;
1424
1425 /* round down addr */
1426 intptr_t adj = mask & (intptr_t)*addr;
1427
1428 *addr = (void *)((intptr_t)*addr - adj);
1429 *length += adj;
1430
1431 /* round up length */
1432 *length = (*length + mask) & ~mask;
1433}
1434
1435#if !_POSIX_MEMLOCK
1436# define eio__mlock(a,b) ((errno = ENOSYS), -1)
1437# define eio__mlockall(a) ((errno = ENOSYS), -1)
1438#else
1439
1440static int
1441eio__mlock (void *addr, size_t length)
1442{
1443 eio_page_align (&addr, &length);
1444
1445 return mlock (addr, length);
1446}
1447
1448static int
1449eio__mlockall (int flags)
1450{
1451 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1452 extern int mallopt (int, int);
1453 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1454 #endif
1455
1456 if (EIO_MCL_CURRENT != MCL_CURRENT
1457 || EIO_MCL_FUTURE != MCL_FUTURE)
1458 {
1459 flags = 0
1460 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
1461 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
1462 }
1463
1464 return mlockall (flags);
1465}
1466#endif
1467
1397#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 1468#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1398# define eio__msync(a,b,c) ((errno = ENOSYS), -1) 1469# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
1399#else 1470#else
1400 1471
1401int 1472int
1402eio__msync (void *mem, size_t len, int flags) 1473eio__msync (void *mem, size_t len, int flags)
1403{ 1474{
1475 eio_page_align (&mem, &len);
1476
1404 if (EIO_MS_ASYNC != MS_SYNC 1477 if (EIO_MS_ASYNC != MS_SYNC
1405 || EIO_MS_INVALIDATE != MS_INVALIDATE 1478 || EIO_MS_INVALIDATE != MS_INVALIDATE
1406 || EIO_MS_SYNC != MS_SYNC) 1479 || EIO_MS_SYNC != MS_SYNC)
1407 { 1480 {
1408 flags = 0 1481 flags = 0
… …
1417#endif 1490#endif
1418 1491
1419int 1492int
1420eio__mtouch (void *mem, size_t len, int flags) 1493eio__mtouch (void *mem, size_t len, int flags)
1421{ 1494{
1495 eio_page_align (&mem, &len);
1496
1497 {
1422 intptr_t addr = (intptr_t)mem; 1498 intptr_t addr = (intptr_t)mem;
1423 intptr_t end = addr + len; 1499 intptr_t end = addr + len;
1424#ifdef PAGESIZE 1500 intptr_t page = eio_pagesize ();
1425 const intptr_t page = PAGESIZE;
1426#else
1427 static intptr_t page;
1428 1501
1429 if (!page)
1430 page = sysconf (_SC_PAGESIZE);
1431#endif
1432
1433 /* round down to start of page, although this is probably useless */
1434 addr &= ~(page - 1); /* assume page size is always a power of two */
1435
1436 if (addr < end) 1502 if (addr < end)
1437 if (flags & EIO_MT_MODIFY) /* modify */ 1503 if (flags & EIO_MT_MODIFY) /* modify */
1438 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len); 1504 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len);
1439 else 1505 else
1440 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len); 1506 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len);
1507 }
1441 1508
1442 return 0; 1509 return 0;
1443} 1510}
1444 1511
1445/*****************************************************************************/ 1512/*****************************************************************************/
… …
1568 return 0; \ 1635 return 0; \
1569 } 1636 }
1570 1637
1571static void eio_execute (etp_worker *self, eio_req *req) 1638static void eio_execute (etp_worker *self, eio_req *req)
1572{ 1639{
1573 errno = 0;
1574
1575 switch (req->type) 1640 switch (req->type)
1576 { 1641 {
1577 case EIO_READ: ALLOC (req->size); 1642 case EIO_READ: ALLOC (req->size);
1578 req->result = req->offs >= 0 1643 req->result = req->offs >= 0
1579 ? pread (req->int1, req->ptr2, req->size, req->offs) 1644 ? pread (req->int1, req->ptr2, req->size, req->offs)
… …
1621 case EIO_SYNC: req->result = 0; sync (); break; 1686 case EIO_SYNC: req->result = 0; sync (); break;
1622 case EIO_FSYNC: req->result = fsync (req->int1); break; 1687 case EIO_FSYNC: req->result = fsync (req->int1); break;
1623 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 1688 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1624 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break; 1689 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
1625 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break; 1690 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;
1691 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
1692 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
1626 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break; 1693 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1627 1694
1628 case EIO_READDIR: eio__scandir (req, self); break; 1695 case EIO_READDIR: eio__scandir (req, self); break;
1629 1696
1630 case EIO_BUSY: 1697 case EIO_BUSY:
1631#ifdef _WIN32 1698#ifdef _WIN32
1632 Sleep (req->nv1 * 1000.); 1699 Sleep (req->nv1 * 1e3);
1633#else 1700#else
1634 { 1701 {
1635 struct timeval tv; 1702 struct timeval tv;
1636 1703
1637 tv.tv_sec = req->nv1; 1704 tv.tv_sec = req->nv1;
1638 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.; 1705 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1e6;
1639 1706
1640 req->result = select (0, 0, 0, 0, &tv); 1707 req->result = select (0, 0, 0, 0, &tv);
1641 } 1708 }
1642#endif 1709#endif
1643 break; 1710 break;
… …
1658 times = tv; 1725 times = tv;
1659 } 1726 }
1660 else 1727 else
1661 times = 0; 1728 times = 0;
1662 1729
1663
1664 req->result = req->type == EIO_FUTIME 1730 req->result = req->type == EIO_FUTIME
1665 ? futimes (req->int1, times) 1731 ? futimes (req->int1, times)
1666 : utimes (req->ptr1, times); 1732 : utimes (req->ptr1, times);
1667 } 1733 }
1668 break; 1734 break;
… …
1677 case EIO_CUSTOM: 1743 case EIO_CUSTOM:
1678 ((void (*)(eio_req *))req->feed) (req); 1744 ((void (*)(eio_req *))req->feed) (req);
1679 break; 1745 break;
1680 1746
1681 default: 1747 default:
1748 errno = ENOSYS;
1682 req->result = -1; 1749 req->result = -1;
1683 break; 1750 break;
1684 } 1751 }
1685 1752
1686 req->errorno = errno; 1753 req->errorno = errno;
… …
1714} 1781}
1715 1782
1716eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 1783eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1717{ 1784{
1718 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 1785 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1786}
1787
1788eio_req *eio_mlock (void *addr, size_t length, int pri, eio_cb cb, void *data)
1789{
1790 REQ (EIO_MLOCK); req->ptr2 = addr; req->size = length; SEND;
1791}
1792
1793eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
1794{
1795 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
1719} 1796}
1720 1797
1721eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data) 1798eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
1722{ 1799{
1723 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND; 1800 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;

Diff Legend

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