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

Comparing libeio/eio.c (file contents):
Revision 1.53 by root, Sat Jan 9 10:03:09 2010 UTC vs.
Revision 1.60 by root, Fri Jan 7 21:45:42 2011 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_MEMLOCK_RANGE || _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
… …
137/* used for struct dirent, AIX doesn't provide it */ 140/* used for struct dirent, AIX doesn't provide it */
138#ifndef NAME_MAX 141#ifndef NAME_MAX
139# define NAME_MAX 4096 142# define NAME_MAX 4096
140#endif 143#endif
141 144
145/* used for readlink etc. */
146#ifndef PATH_MAX
147# define PATH_MAX 4096
148#endif
149
142/* buffer size for various temporary buffers */ 150/* buffer size for various temporary buffers */
143#define EIO_BUFSIZE 65536 151#define EIO_BUFSIZE 65536
144 152
145#define dBUF \ 153#define dBUF \
146 char *eio_buf; \ 154 char *eio_buf; \
… …
217static volatile unsigned int nreqs; /* reqlock */ 225static volatile unsigned int nreqs; /* reqlock */
218static volatile unsigned int nready; /* reqlock */ 226static volatile unsigned int nready; /* reqlock */
219static volatile unsigned int npending; /* reqlock */ 227static volatile unsigned int npending; /* reqlock */
220static volatile unsigned int max_idle = 4; 228static volatile unsigned int max_idle = 4;
221 229
222static mutex_t wrklock = X_MUTEX_INIT; 230static xmutex_t wrklock = X_MUTEX_INIT;
223static mutex_t reslock = X_MUTEX_INIT; 231static xmutex_t reslock = X_MUTEX_INIT;
224static mutex_t reqlock = X_MUTEX_INIT; 232static xmutex_t reqlock = X_MUTEX_INIT;
225static cond_t reqwait = X_COND_INIT; 233static xcond_t reqwait = X_COND_INIT;
226 234
227#if !HAVE_PREADWRITE 235#if !HAVE_PREADWRITE
228/* 236/*
229 * make our pread/pwrite emulation safe against themselves, but not against 237 * make our pread/pwrite emulation safe against themselves, but not against
230 * 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,
231 * but that's your problem, not mine. 239 * but that's your problem, not mine.
232 */ 240 */
233static mutex_t preadwritelock = X_MUTEX_INIT; 241static xmutex_t preadwritelock = X_MUTEX_INIT;
234#endif 242#endif
235 243
236typedef struct etp_worker 244typedef struct etp_worker
237{ 245{
238 /* locked by wrklock */ 246 /* locked by wrklock */
239 struct etp_worker *prev, *next; 247 struct etp_worker *prev, *next;
240 248
241 thread_t tid; 249 xthread_t tid;
242 250
243 /* locked by reslock, reqlock or wrklock */ 251 /* locked by reslock, reqlock or wrklock */
244 ETP_REQ *req; /* currently processed request */ 252 ETP_REQ *req; /* currently processed request */
245 253
246 ETP_WORKER_COMMON 254 ETP_WORKER_COMMON
… …
808 816
809 return res; 817 return res;
810} 818}
811#endif 819#endif
812 820
813#ifndef HAVE_FUTIMES 821#ifndef HAVE_UTIMES
814 822
815# undef utimes 823# undef utimes
816# undef futimes
817# define utimes(path,times) eio__utimes (path, times) 824# define utimes(path,times) eio__utimes (path, times)
818# define futimes(fd,times) eio__futimes (fd, times)
819 825
820static int 826static int
821eio__utimes (const char *filename, const struct timeval times[2]) 827eio__utimes (const char *filename, const struct timeval times[2])
822{ 828{
823 if (times) 829 if (times)
… …
830 return utime (filename, &buf); 836 return utime (filename, &buf);
831 } 837 }
832 else 838 else
833 return utime (filename, 0); 839 return utime (filename, 0);
834} 840}
841
842#endif
843
844#ifndef HAVE_FUTIMES
845
846# undef futimes
847# define futimes(fd,times) eio__futimes (fd, times)
835 848
836static int eio__futimes (int fd, const struct timeval tv[2]) 849static int eio__futimes (int fd, const struct timeval tv[2])
837{ 850{
838 errno = ENOSYS; 851 errno = ENOSYS;
839 return -1; 852 return -1;
… …
1387 break; 1400 break;
1388 } 1401 }
1389 } 1402 }
1390} 1403}
1391 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__mlockall(a) ((errno = ENOSYS), -1)
1437#else
1438
1439static int
1440eio__mlockall (int flags)
1441{
1442 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1443 extern int mallopt (int, int);
1444 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1445 #endif
1446
1447 if (EIO_MCL_CURRENT != MCL_CURRENT
1448 || EIO_MCL_FUTURE != MCL_FUTURE)
1449 {
1450 flags = 0
1451 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
1452 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
1453 }
1454
1455 return mlockall (flags);
1456}
1457#endif
1458
1459#if !_POSIX_MEMLOCK_RANGE
1460# define eio__mlock(a,b) ((errno = ENOSYS), -1)
1461#else
1462
1463static int
1464eio__mlock (void *addr, size_t length)
1465{
1466 eio_page_align (&addr, &length);
1467
1468 return mlock (addr, length);
1469}
1470
1471#endif
1472
1392#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 1473#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1393# define eio__msync(a,b,c) ((errno = ENOSYS), -1) 1474# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
1394#else 1475#else
1395 1476
1396int 1477int
1397eio__msync (void *mem, size_t len, int flags) 1478eio__msync (void *mem, size_t len, int flags)
1398{ 1479{
1480 eio_page_align (&mem, &len);
1481
1399 if (EIO_MS_ASYNC != MS_SYNC 1482 if (EIO_MS_ASYNC != MS_SYNC
1400 || EIO_MS_INVALIDATE != MS_INVALIDATE 1483 || EIO_MS_INVALIDATE != MS_INVALIDATE
1401 || EIO_MS_SYNC != MS_SYNC) 1484 || EIO_MS_SYNC != MS_SYNC)
1402 { 1485 {
1403 flags = 0 1486 flags = 0
… …
1412#endif 1495#endif
1413 1496
1414int 1497int
1415eio__mtouch (void *mem, size_t len, int flags) 1498eio__mtouch (void *mem, size_t len, int flags)
1416{ 1499{
1500 eio_page_align (&mem, &len);
1501
1502 {
1417 intptr_t addr = (intptr_t)mem; 1503 intptr_t addr = (intptr_t)mem;
1418 intptr_t end = addr + len; 1504 intptr_t end = addr + len;
1419#ifdef PAGESIZE 1505 intptr_t page = eio_pagesize ();
1420 const intptr_t page = PAGESIZE;
1421#else
1422 static intptr_t page;
1423 1506
1424 if (!page)
1425 page = sysconf (_SC_PAGESIZE);
1426#endif
1427
1428 /* round down to start of page, although this is probably useless */
1429 addr &= ~(page - 1); /* assume page size is always a power of two */
1430
1431 if (addr < end) 1507 if (addr < end)
1432 if (flags & EIO_MT_MODIFY) /* modify */ 1508 if (flags & EIO_MT_MODIFY) /* modify */
1433 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len); 1509 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len);
1434 else 1510 else
1435 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len); 1511 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len);
1512 }
1436 1513
1437 return 0; 1514 return 0;
1438} 1515}
1439 1516
1440/*****************************************************************************/ 1517/*****************************************************************************/
… …
1563 return 0; \ 1640 return 0; \
1564 } 1641 }
1565 1642
1566static void eio_execute (etp_worker *self, eio_req *req) 1643static void eio_execute (etp_worker *self, eio_req *req)
1567{ 1644{
1568 errno = 0;
1569
1570 switch (req->type) 1645 switch (req->type)
1571 { 1646 {
1572 case EIO_READ: ALLOC (req->size); 1647 case EIO_READ: ALLOC (req->size);
1573 req->result = req->offs >= 0 1648 req->result = req->offs >= 0
1574 ? pread (req->int1, req->ptr2, req->size, req->offs) 1649 ? pread (req->int1, req->ptr2, req->size, req->offs)
… …
1608 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break; 1683 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1609 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break; 1684 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1610 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break; 1685 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1611 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->int3); break; 1686 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->int3); break;
1612 1687
1613 case EIO_READLINK: ALLOC (NAME_MAX); 1688 case EIO_READLINK: ALLOC (PATH_MAX);
1614 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break; 1689 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1615 1690
1616 case EIO_SYNC: req->result = 0; sync (); break; 1691 case EIO_SYNC: req->result = 0; sync (); break;
1617 case EIO_FSYNC: req->result = fsync (req->int1); break; 1692 case EIO_FSYNC: req->result = fsync (req->int1); break;
1618 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 1693 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1619 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break; 1694 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
1620 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break; 1695 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;
1696 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
1697 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
1621 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break; 1698 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1622 1699
1623 case EIO_READDIR: eio__scandir (req, self); break; 1700 case EIO_READDIR: eio__scandir (req, self); break;
1624 1701
1625 case EIO_BUSY: 1702 case EIO_BUSY:
1626#ifdef _WIN32 1703#ifdef _WIN32
1627 Sleep (req->nv1 * 1000.); 1704 Sleep (req->nv1 * 1e3);
1628#else 1705#else
1629 { 1706 {
1630 struct timeval tv; 1707 struct timeval tv;
1631 1708
1632 tv.tv_sec = req->nv1; 1709 tv.tv_sec = req->nv1;
1633 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.; 1710 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1e6;
1634 1711
1635 req->result = select (0, 0, 0, 0, &tv); 1712 req->result = select (0, 0, 0, 0, &tv);
1636 } 1713 }
1637#endif 1714#endif
1638 break; 1715 break;
… …
1653 times = tv; 1730 times = tv;
1654 } 1731 }
1655 else 1732 else
1656 times = 0; 1733 times = 0;
1657 1734
1658
1659 req->result = req->type == EIO_FUTIME 1735 req->result = req->type == EIO_FUTIME
1660 ? futimes (req->int1, times) 1736 ? futimes (req->int1, times)
1661 : utimes (req->ptr1, times); 1737 : utimes (req->ptr1, times);
1662 } 1738 }
1663 break; 1739 break;
… …
1672 case EIO_CUSTOM: 1748 case EIO_CUSTOM:
1673 ((void (*)(eio_req *))req->feed) (req); 1749 ((void (*)(eio_req *))req->feed) (req);
1674 break; 1750 break;
1675 1751
1676 default: 1752 default:
1753 errno = ENOSYS;
1677 req->result = -1; 1754 req->result = -1;
1678 break; 1755 break;
1679 } 1756 }
1680 1757
1681 req->errorno = errno; 1758 req->errorno = errno;
… …
1709} 1786}
1710 1787
1711eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 1788eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1712{ 1789{
1713 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 1790 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1791}
1792
1793eio_req *eio_mlock (void *addr, size_t length, int pri, eio_cb cb, void *data)
1794{
1795 REQ (EIO_MLOCK); req->ptr2 = addr; req->size = length; SEND;
1796}
1797
1798eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
1799{
1800 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
1714} 1801}
1715 1802
1716eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data) 1803eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
1717{ 1804{
1718 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND; 1805 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