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

Comparing libeio/eio.c (file contents):
Revision 1.78 by root, Tue Jul 5 14:38:53 2011 UTC vs.
Revision 1.86 by root, Thu Jul 14 18:30:10 2011 UTC

… …
54#include <stdlib.h> 54#include <stdlib.h>
55#include <string.h> 55#include <string.h>
56#include <errno.h> 56#include <errno.h>
57#include <sys/types.h> 57#include <sys/types.h>
58#include <sys/stat.h> 58#include <sys/stat.h>
59#include <sys/statvfs.h>
60#include <limits.h> 59#include <limits.h>
61#include <fcntl.h> 60#include <fcntl.h>
62#include <assert.h> 61#include <assert.h>
63 62
63#include <sys/statvfs.h>
64/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */ 64/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */
65/* intptr_t only comes form stdint.h, says idiot openbsd coder */ 65/* intptr_t only comes from stdint.h, says idiot openbsd coder */
66#if HAVE_STDINT_H 66#if HAVE_STDINT_H
67# include <stdint.h> 67# include <stdint.h>
68#endif 68#endif
69 69
70#ifndef ECANCELED
71# define ECANCELED EDOM
72#endif
73
74static void eio_destroy (eio_req *req);
75
70#ifndef EIO_FINISH 76#ifndef EIO_FINISH
71# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0 77# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0
72#endif 78#endif
73 79
74#ifndef EIO_DESTROY 80#ifndef EIO_DESTROY
… …
77 83
78#ifndef EIO_FEED 84#ifndef EIO_FEED
79# define EIO_FEED(req) do { if ((req)->feed ) (req)->feed (req); } while (0) 85# define EIO_FEED(req) do { if ((req)->feed ) (req)->feed (req); } while (0)
80#endif 86#endif
81 87
88#ifndef EIO_FD_TO_WIN32_HANDLE
89# define EIO_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
90#endif
91#ifndef EIO_WIN32_HANDLE_TO_FD
92# define EIO_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
93#endif
94
95#define EIO_ERRNO(errval,retval) ((errno = errval), retval)
96
97#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1)
98
82#ifdef _WIN32 99#ifdef _WIN32
83 100
84 /*doh*/ 101 #define PAGESIZE 4096 /* GetSystemInfo? */
102
103 #define stat(path,buf) _stati64 (path,buf)
104 #define lstat(path,buf) stat (path,buf)
105 #define fstat(fd,buf) _fstati64 (path,buf)
106 #define fsync(fd) (FlushFileBuffers (EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))
107 #define mkdir(path,mode) _mkdir (path)
108 #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))
109
110 #define chown(path,uid,gid) EIO_ENOSYS ()
111 #define fchown(fd,uid,gid) EIO_ENOSYS ()
112 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
113 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
114 #define mknod(path,mode,dev) EIO_ENOSYS ()
115 #define sync() EIO_ENOSYS ()
116
117 /* we could even stat and see if it exists */
118 static int
119 symlink (const char *old, const char *neu)
120 {
121 if (CreateSymbolicLink (neu, old, 1))
122 return 0;
123
124 if (CreateSymbolicLink (neu, old, 0))
125 return 0;
126
127 return EIO_ERRNO (ENOENT, -1);
128 }
129
85#else 130#else
86 131
87# include <sys/time.h> 132 #include <sys/time.h>
88# include <sys/select.h> 133 #include <sys/select.h>
134 #include <sys/statvfs.h>
89# include <unistd.h> 135 #include <unistd.h>
90# include <utime.h> 136 #include <utime.h>
91# include <signal.h> 137 #include <signal.h>
92# include <dirent.h> 138 #include <dirent.h>
93 139
94#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES 140 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
95# include <sys/mman.h> 141 #include <sys/mman.h>
96#endif 142 #endif
97 143
98/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */ 144 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
99# if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 145 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
100# define _DIRENT_HAVE_D_TYPE /* sigh */ 146 #define _DIRENT_HAVE_D_TYPE /* sigh */
101# define D_INO(de) (de)->d_fileno 147 #define D_INO(de) (de)->d_fileno
102# define D_NAMLEN(de) (de)->d_namlen 148 #define D_NAMLEN(de) (de)->d_namlen
103# elif __linux || defined d_ino || _XOPEN_SOURCE >= 600 149 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
104# define D_INO(de) (de)->d_ino 150 #define D_INO(de) (de)->d_ino
105# endif 151 #endif
106 152
107#ifdef _D_EXACT_NAMLEN 153 #ifdef _D_EXACT_NAMLEN
108# undef D_NAMLEN 154 #undef D_NAMLEN
109# define D_NAMLEN(de) _D_EXACT_NAMLEN (de) 155 #define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
110#endif 156 #endif
111 157
112# ifdef _DIRENT_HAVE_D_TYPE 158 #ifdef _DIRENT_HAVE_D_TYPE
113# define D_TYPE(de) (de)->d_type 159 #define D_TYPE(de) (de)->d_type
114# endif 160 #endif
115 161
116# ifndef EIO_STRUCT_DIRENT 162 #ifndef EIO_STRUCT_DIRENT
117# define EIO_STRUCT_DIRENT struct dirent 163 #define EIO_STRUCT_DIRENT struct dirent
118# endif 164 #endif
119 165
120#endif 166#endif
121 167
122#if HAVE_SENDFILE 168#if HAVE_SENDFILE
123# if __linux 169# if __linux
… …
375} 421}
376 422
377static void ecb_cold 423static void ecb_cold
378etp_thread_init (void) 424etp_thread_init (void)
379{ 425{
426#if !HAVE_PREADWRITE
427 X_MUTEX_CREATE (preadwritelock);
428#endif
380 X_MUTEX_CREATE (wrklock); 429 X_MUTEX_CREATE (wrklock);
381 X_MUTEX_CREATE (reslock); 430 X_MUTEX_CREATE (reslock);
382 X_MUTEX_CREATE (reqlock); 431 X_MUTEX_CREATE (reqlock);
383 X_COND_CREATE (reqwait); 432 X_COND_CREATE (reqwait);
384} 433}
385 434
386static void ecb_cold 435static void ecb_cold
387etp_atfork_prepare (void) 436etp_atfork_prepare (void)
388{ 437{
389 X_LOCK (wrklock);
390 X_LOCK (reqlock);
391 X_LOCK (reslock);
392#if !HAVE_PREADWRITE
393 X_LOCK (preadwritelock);
394#endif
395} 438}
396 439
397static void ecb_cold 440static void ecb_cold
398etp_atfork_parent (void) 441etp_atfork_parent (void)
399{ 442{
400#if !HAVE_PREADWRITE
401 X_UNLOCK (preadwritelock);
402#endif
403 X_UNLOCK (reslock);
404 X_UNLOCK (reqlock);
405 X_UNLOCK (wrklock);
406} 443}
407 444
408static void ecb_cold 445static void ecb_cold
409etp_atfork_child (void) 446etp_atfork_child (void)
410{ 447{
… …
583} 620}
584 621
585static void 622static void
586etp_cancel (ETP_REQ *req) 623etp_cancel (ETP_REQ *req)
587{ 624{
588 X_LOCK (wrklock); 625 req->cancelled = 1;
589 req->flags |= EIO_FLAG_CANCELLED;
590 X_UNLOCK (wrklock);
591 626
592 eio_grp_cancel (req); 627 eio_grp_cancel (req);
593} 628}
594 629
595static void 630static void
… …
711 return eio_finish (grp); 746 return eio_finish (grp);
712 else 747 else
713 return 0; 748 return 0;
714} 749}
715 750
716void 751static void
717eio_destroy (eio_req *req) 752eio_destroy (eio_req *req)
718{ 753{
719 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1); 754 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1);
720 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2); 755 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2);
721 756
… …
739 if (grp->grp_first == req) 774 if (grp->grp_first == req)
740 grp->grp_first = req->grp_next; 775 grp->grp_first = req->grp_next;
741 776
742 res2 = grp_dec (grp); 777 res2 = grp_dec (grp);
743 778
744 if (!res && res2) 779 if (!res)
745 res = res2; 780 res = res2;
746 } 781 }
747 782
748 eio_destroy (req); 783 eio_destroy (req);
749 784
… …
944 /* even though we could play tricks with the flags, it's better to always 979 /* even though we could play tricks with the flags, it's better to always
945 * call fdatasync, as that matches the expectation of its users best */ 980 * call fdatasync, as that matches the expectation of its users best */
946 return fdatasync (fd); 981 return fdatasync (fd);
947} 982}
948 983
984static int
985eio__fallocate (int fd, int mode, off_t offset, size_t len)
986{
987#if HAVE_FALLOCATE
988 return fallocate (fd, mode, offset, len);
989#else
990 errno = ENOSYS;
991 return -1;
992#endif
993}
994
949#if !HAVE_READAHEAD 995#if !HAVE_READAHEAD
950# undef readahead 996# undef readahead
951# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self) 997# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
952 998
953static ssize_t 999static ssize_t
… …
981 if (!count) 1027 if (!count)
982 return 0; 1028 return 0;
983 1029
984 for (;;) 1030 for (;;)
985 { 1031 {
1032#ifdef __APPLE__
1033# undef HAVE_SENDFILE /* broken, as everything on os x */
1034#endif
986#if HAVE_SENDFILE 1035#if HAVE_SENDFILE
987# if __linux 1036# if __linux
988 off_t soffset = offset; 1037 off_t soffset = offset;
989 res = sendfile (ofd, ifd, &soffset, count); 1038 res = sendfile (ofd, ifd, &soffset, count);
990 1039
… …
1006 1055
1007 /* according to source inspection, this is correct, and useful behaviour */ 1056 /* according to source inspection, this is correct, and useful behaviour */
1008 if (sbytes) 1057 if (sbytes)
1009 res = sbytes; 1058 res = sbytes;
1010 1059
1011# elif defined (__APPLE__) && 0 /* broken, as everything on os x */ 1060# elif defined (__APPLE__)
1012 off_t sbytes = count; 1061 off_t sbytes = count;
1013 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 1062 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1014 1063
1015 /* according to the manpage, sbytes is always valid */ 1064 /* according to the manpage, sbytes is always valid */
1016 if (sbytes) 1065 if (sbytes)
… …
1033 if (res < 0 && sbytes) 1082 if (res < 0 && sbytes)
1034 res = sbytes; 1083 res = sbytes;
1035 1084
1036# endif 1085# endif
1037 1086
1038#elif defined (_WIN32) 1087#elif defined (_WIN32) && 0
1039 /* does not work, just for documentation of what would need to be done */ 1088 /* does not work, just for documentation of what would need to be done */
1040 /* actually, cannot be done like this, as TransmitFile changes the file offset, */ 1089 /* actually, cannot be done like this, as TransmitFile changes the file offset, */
1041 /* libeio guarantees that the file offset does not change, and windows */ 1090 /* libeio guarantees that the file offset does not change, and windows */
1042 /* has no way to get an independent handle to the same file description */ 1091 /* has no way to get an independent handle to the same file description */
1043 HANDLE h = TO_SOCKET (ifd); 1092 HANDLE h = TO_SOCKET (ifd);
… …
1148 /* round up length */ 1197 /* round up length */
1149 *length = (*length + mask) & ~mask; 1198 *length = (*length + mask) & ~mask;
1150} 1199}
1151 1200
1152#if !_POSIX_MEMLOCK 1201#if !_POSIX_MEMLOCK
1153# define eio__mlockall(a) ((errno = ENOSYS), -1) 1202# define eio__mlockall(a) eio_nosyscall()
1154#else 1203#else
1155 1204
1156static int 1205static int
1157eio__mlockall (int flags) 1206eio__mlockall (int flags)
1158{ 1207{
… …
1172 return mlockall (flags); 1221 return mlockall (flags);
1173} 1222}
1174#endif 1223#endif
1175 1224
1176#if !_POSIX_MEMLOCK_RANGE 1225#if !_POSIX_MEMLOCK_RANGE
1177# define eio__mlock(a,b) ((errno = ENOSYS), -1) 1226# define eio__mlock(a,b) EIO_ENOSYS ()
1178#else 1227#else
1179 1228
1180static int 1229static int
1181eio__mlock (void *addr, size_t length) 1230eio__mlock (void *addr, size_t length)
1182{ 1231{
… …
1186} 1235}
1187 1236
1188#endif 1237#endif
1189 1238
1190#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 1239#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1191# define eio__msync(a,b,c) ((errno = ENOSYS), -1) 1240# define eio__msync(a,b,c) EIO_ENOSYS ()
1192#else 1241#else
1193 1242
1194static int 1243static int
1195eio__msync (void *mem, size_t len, int flags) 1244eio__msync (void *mem, size_t len, int flags)
1196{ 1245{
… …
1785X_THREAD_PROC (etp_proc) 1834X_THREAD_PROC (etp_proc)
1786{ 1835{
1787 ETP_REQ *req; 1836 ETP_REQ *req;
1788 struct timespec ts; 1837 struct timespec ts;
1789 etp_worker *self = (etp_worker *)thr_arg; 1838 etp_worker *self = (etp_worker *)thr_arg;
1839 int timeout;
1790 1840
1791 /* try to distribute timeouts somewhat randomly */ 1841 /* try to distribute timeouts somewhat evenly */
1792 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 1842 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1793 1843
1794 for (;;) 1844 for (;;)
1795 { 1845 {
1846 ts.tv_sec = 0;
1847
1796 X_LOCK (reqlock); 1848 X_LOCK (reqlock);
1797 1849
1798 for (;;) 1850 for (;;)
1799 { 1851 {
1800 self->req = req = reqq_shift (&req_queue); 1852 self->req = req = reqq_shift (&req_queue);
1801 1853
1802 if (req) 1854 if (req)
1803 break; 1855 break;
1804 1856
1857 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
1858 {
1859 X_UNLOCK (reqlock);
1860 X_LOCK (wrklock);
1861 --started;
1862 X_UNLOCK (wrklock);
1863 goto quit;
1864 }
1865
1805 ++idle; 1866 ++idle;
1806 1867
1807 ts.tv_sec = time (0) + idle_timeout; 1868 if (idle <= max_idle)
1808 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) 1869 /* we are allowed to idle, so do so without any timeout */
1870 X_COND_WAIT (reqwait, reqlock);
1871 else
1809 { 1872 {
1810 if (idle > max_idle) 1873 /* initialise timeout once */
1811 { 1874 if (!ts.tv_sec)
1812 --idle; 1875 ts.tv_sec = time (0) + idle_timeout;
1813 X_UNLOCK (reqlock);
1814 X_LOCK (wrklock);
1815 --started;
1816 X_UNLOCK (wrklock);
1817 goto quit;
1818 }
1819 1876
1820 /* we are allowed to idle, so do so without any timeout */
1821 X_COND_WAIT (reqwait, reqlock); 1877 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1878 ts.tv_sec = 1; /* assuming this is not a value computed above.,.. */
1822 } 1879 }
1823 1880
1824 --idle; 1881 --idle;
1825 } 1882 }
1826 1883
… …
1829 X_UNLOCK (reqlock); 1886 X_UNLOCK (reqlock);
1830 1887
1831 if (req->type < 0) 1888 if (req->type < 0)
1832 goto quit; 1889 goto quit;
1833 1890
1834 if (!EIO_CANCELLED (req))
1835 ETP_EXECUTE (self, req); 1891 ETP_EXECUTE (self, req);
1836 1892
1837 X_LOCK (reslock); 1893 X_LOCK (reslock);
1838 1894
1839 ++npending; 1895 ++npending;
1840 1896
… …
1894 } 1950 }
1895 1951
1896static void 1952static void
1897eio_execute (etp_worker *self, eio_req *req) 1953eio_execute (etp_worker *self, eio_req *req)
1898{ 1954{
1955 if (ecb_expect_false (EIO_CANCELLED (req)))
1956 {
1957 req->result = -1;
1958 req->errorno = ECANCELED;
1959 return;
1960 }
1961
1899 switch (req->type) 1962 switch (req->type)
1900 { 1963 {
1901 case EIO_READ: ALLOC (req->size); 1964 case EIO_READ: ALLOC (req->size);
1902 req->result = req->offs >= 0 1965 req->result = req->offs >= 0
1903 ? pread (req->int1, req->ptr2, req->size, req->offs) 1966 ? pread (req->int1, req->ptr2, req->size, req->offs)
… …
1950 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break; 2013 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
1951 case EIO_MTOUCH: req->result = eio__mtouch (req); break; 2014 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
1952 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break; 2015 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
1953 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 2016 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
1954 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break; 2017 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2018 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
1955 2019
1956 case EIO_READDIR: eio__scandir (req, self); break; 2020 case EIO_READDIR: eio__scandir (req, self); break;
1957 2021
1958 case EIO_BUSY: 2022 case EIO_BUSY:
1959#ifdef _WIN32 2023#ifdef _WIN32
… …
2059eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data) 2123eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2060{ 2124{
2061 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND; 2125 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2062} 2126}
2063 2127
2128eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
2129{
2130 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
2131}
2132
2064eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data) 2133eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2065{ 2134{
2066 REQ (EIO_FDATASYNC); req->int1 = fd; SEND; 2135 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2067} 2136}
2068 2137

Diff Legend

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