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

Comparing libeio/eio.c (file contents):
Revision 1.54 by root, Tue Feb 23 14:32:45 2010 UTC vs.
Revision 1.58 by root, Sat Oct 30 14:36:53 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
… …
222static volatile unsigned int nreqs; /* reqlock */ 225static volatile unsigned int nreqs; /* reqlock */
223static volatile unsigned int nready; /* reqlock */ 226static volatile unsigned int nready; /* reqlock */
224static volatile unsigned int npending; /* reqlock */ 227static volatile unsigned int npending; /* reqlock */
225static volatile unsigned int max_idle = 4; 228static volatile unsigned int max_idle = 4;
226 229
227static mutex_t wrklock = X_MUTEX_INIT; 230static xmutex_t wrklock = X_MUTEX_INIT;
228static mutex_t reslock = X_MUTEX_INIT; 231static xmutex_t reslock = X_MUTEX_INIT;
229static mutex_t reqlock = X_MUTEX_INIT; 232static xmutex_t reqlock = X_MUTEX_INIT;
230static cond_t reqwait = X_COND_INIT; 233static xcond_t reqwait = X_COND_INIT;
231 234
232#if !HAVE_PREADWRITE 235#if !HAVE_PREADWRITE
233/* 236/*
234 * make our pread/pwrite emulation safe against themselves, but not against 237 * make our pread/pwrite emulation safe against themselves, but not against
235 * 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,
236 * but that's your problem, not mine. 239 * but that's your problem, not mine.
237 */ 240 */
238static mutex_t preadwritelock = X_MUTEX_INIT; 241static xmutex_t preadwritelock = X_MUTEX_INIT;
239#endif 242#endif
240 243
241typedef struct etp_worker 244typedef struct etp_worker
242{ 245{
243 /* locked by wrklock */ 246 /* locked by wrklock */
244 struct etp_worker *prev, *next; 247 struct etp_worker *prev, *next;
245 248
246 thread_t tid; 249 xthread_t tid;
247 250
248 /* locked by reslock, reqlock or wrklock */ 251 /* locked by reslock, reqlock or wrklock */
249 ETP_REQ *req; /* currently processed request */ 252 ETP_REQ *req; /* currently processed request */
250 253
251 ETP_WORKER_COMMON 254 ETP_WORKER_COMMON
… …
1392 break; 1395 break;
1393 } 1396 }
1394 } 1397 }
1395} 1398}
1396 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 return 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 return mlockall (flags);
1460}
1461#endif
1462
1397#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 1463#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1398# define eio__msync(a,b,c) ((errno = ENOSYS), -1) 1464# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
1399#else 1465#else
1400 1466
1401int 1467int
1402eio__msync (void *mem, size_t len, int flags) 1468eio__msync (void *mem, size_t len, int flags)
1403{ 1469{
1470 eio_page_align (&mem, &len);
1471
1404 if (EIO_MS_ASYNC != MS_SYNC 1472 if (EIO_MS_ASYNC != MS_SYNC
1405 || EIO_MS_INVALIDATE != MS_INVALIDATE 1473 || EIO_MS_INVALIDATE != MS_INVALIDATE
1406 || EIO_MS_SYNC != MS_SYNC) 1474 || EIO_MS_SYNC != MS_SYNC)
1407 { 1475 {
1408 flags = 0 1476 flags = 0
… …
1417#endif 1485#endif
1418 1486
1419int 1487int
1420eio__mtouch (void *mem, size_t len, int flags) 1488eio__mtouch (void *mem, size_t len, int flags)
1421{ 1489{
1490 eio_page_align (&mem, &len);
1491
1492 {
1422 intptr_t addr = (intptr_t)mem; 1493 intptr_t addr = (intptr_t)mem;
1423 intptr_t end = addr + len; 1494 intptr_t end = addr + len;
1424#ifdef PAGESIZE 1495 intptr_t page = eio_pagesize ();
1425 const intptr_t page = PAGESIZE;
1426#else
1427 static intptr_t page;
1428 1496
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) 1497 if (addr < end)
1437 if (flags & EIO_MT_MODIFY) /* modify */ 1498 if (flags & EIO_MT_MODIFY) /* modify */
1438 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len); 1499 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len);
1439 else 1500 else
1440 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len); 1501 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len);
1502 }
1441 1503
1442 return 0; 1504 return 0;
1443} 1505}
1444 1506
1445/*****************************************************************************/ 1507/*****************************************************************************/
… …
1568 return 0; \ 1630 return 0; \
1569 } 1631 }
1570 1632
1571static void eio_execute (etp_worker *self, eio_req *req) 1633static void eio_execute (etp_worker *self, eio_req *req)
1572{ 1634{
1573 errno = 0;
1574
1575 switch (req->type) 1635 switch (req->type)
1576 { 1636 {
1577 case EIO_READ: ALLOC (req->size); 1637 case EIO_READ: ALLOC (req->size);
1578 req->result = req->offs >= 0 1638 req->result = req->offs >= 0
1579 ? pread (req->int1, req->ptr2, req->size, req->offs) 1639 ? pread (req->int1, req->ptr2, req->size, req->offs)
… …
1621 case EIO_SYNC: req->result = 0; sync (); break; 1681 case EIO_SYNC: req->result = 0; sync (); break;
1622 case EIO_FSYNC: req->result = fsync (req->int1); break; 1682 case EIO_FSYNC: req->result = fsync (req->int1); break;
1623 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 1683 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1624 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break; 1684 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; 1685 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;
1686 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
1687 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; 1688 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1627 1689
1628 case EIO_READDIR: eio__scandir (req, self); break; 1690 case EIO_READDIR: eio__scandir (req, self); break;
1629 1691
1630 case EIO_BUSY: 1692 case EIO_BUSY:
1631#ifdef _WIN32 1693#ifdef _WIN32
1632 Sleep (req->nv1 * 1000.); 1694 Sleep (req->nv1 * 1e3);
1633#else 1695#else
1634 { 1696 {
1635 struct timeval tv; 1697 struct timeval tv;
1636 1698
1637 tv.tv_sec = req->nv1; 1699 tv.tv_sec = req->nv1;
1638 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.; 1700 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1e6;
1639 1701
1640 req->result = select (0, 0, 0, 0, &tv); 1702 req->result = select (0, 0, 0, 0, &tv);
1641 } 1703 }
1642#endif 1704#endif
1643 break; 1705 break;
… …
1658 times = tv; 1720 times = tv;
1659 } 1721 }
1660 else 1722 else
1661 times = 0; 1723 times = 0;
1662 1724
1663
1664 req->result = req->type == EIO_FUTIME 1725 req->result = req->type == EIO_FUTIME
1665 ? futimes (req->int1, times) 1726 ? futimes (req->int1, times)
1666 : utimes (req->ptr1, times); 1727 : utimes (req->ptr1, times);
1667 } 1728 }
1668 break; 1729 break;
… …
1677 case EIO_CUSTOM: 1738 case EIO_CUSTOM:
1678 ((void (*)(eio_req *))req->feed) (req); 1739 ((void (*)(eio_req *))req->feed) (req);
1679 break; 1740 break;
1680 1741
1681 default: 1742 default:
1743 errno = ENOSYS;
1682 req->result = -1; 1744 req->result = -1;
1683 break; 1745 break;
1684 } 1746 }
1685 1747
1686 req->errorno = errno; 1748 req->errorno = errno;
… …
1714} 1776}
1715 1777
1716eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 1778eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1717{ 1779{
1718 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 1780 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1781}
1782
1783eio_req *eio_mlock (void *addr, size_t length, int pri, eio_cb cb, void *data)
1784{
1785 REQ (EIO_MLOCK); req->ptr2 = addr; req->size = length; SEND;
1786}
1787
1788eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
1789{
1790 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
1719} 1791}
1720 1792
1721eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data) 1793eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
1722{ 1794{
1723 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND; 1795 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