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

Comparing libeio/eio.c (file contents):
Revision 1.93 by root, Mon Jul 18 01:27:03 2011 UTC vs.
Revision 1.97 by root, Sun Jul 24 03:32:54 2011 UTC

… …
71#endif 71#endif
72#ifndef ELOOP 72#ifndef ELOOP
73# define ELOOP EDOM 73# define ELOOP EDOM
74#endif 74#endif
75 75
76#if !defined(ENOTSOCK) && defined(WSAENOTSOCK)
77# define ENOTSOCK WSAENOTSOCK
78#endif
79
76static void eio_destroy (eio_req *req); 80static void eio_destroy (eio_req *req);
77 81
78#ifndef EIO_FINISH 82#ifndef EIO_FINISH
79# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0 83# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0
80#endif 84#endif
… …
103 #undef PAGESIZE 107 #undef PAGESIZE
104 #define PAGESIZE 4096 /* GetSystemInfo? */ 108 #define PAGESIZE 4096 /* GetSystemInfo? */
105 109
106 #ifdef EIO_STRUCT_STATI64 110 #ifdef EIO_STRUCT_STATI64
107 #define stat(path,buf) _stati64 (path,buf) 111 #define stat(path,buf) _stati64 (path,buf)
108 #define fstat(fd,buf) _fstati64 (path,buf) 112 #define fstat(fd,buf) _fstati64 (fd,buf)
109 #endif 113 #endif
110 #define lstat(path,buf) stat (path,buf) 114 #define lstat(path,buf) stat (path,buf)
111 #define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1)) 115 #define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))
112 #define mkdir(path,mode) _mkdir (path) 116 #define mkdir(path,mode) _mkdir (path)
113 #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1)) 117 #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))
… …
160 164
161 #include <sys/time.h> 165 #include <sys/time.h>
162 #include <sys/select.h> 166 #include <sys/select.h>
163 #include <sys/statvfs.h> 167 #include <sys/statvfs.h>
164 #include <unistd.h> 168 #include <unistd.h>
165 #include <utime.h>
166 #include <signal.h> 169 #include <signal.h>
167 #include <dirent.h> 170 #include <dirent.h>
168 171
169 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES 172 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
170 #include <sys/mman.h> 173 #include <sys/mman.h>
… …
192 195
193 #ifndef EIO_STRUCT_DIRENT 196 #ifndef EIO_STRUCT_DIRENT
194 #define EIO_STRUCT_DIRENT struct dirent 197 #define EIO_STRUCT_DIRENT struct dirent
195 #endif 198 #endif
196 199
200#endif
201
202#if HAVE_UTIMES
203# include <utime.h>
197#endif 204#endif
198 205
199#if HAVE_SENDFILE 206#if HAVE_SENDFILE
200# if __linux 207# if __linux
201# include <sys/sendfile.h> 208# include <sys/sendfile.h>
… …
209# else 216# else
210# error sendfile support requested but not available 217# error sendfile support requested but not available
211# endif 218# endif
212#endif 219#endif
213 220
221#if HAVE_SYS_SYSCALL_H
222# include <sys/syscall.h>
223#endif
224
214#ifndef D_TYPE 225#ifndef D_TYPE
215# define D_TYPE(de) 0 226# define D_TYPE(de) 0
216#endif 227#endif
217#ifndef D_INO 228#ifndef D_INO
218# define D_INO(de) 0 229# define D_INO(de) 0
… …
233 244
234/* buffer size for various temporary buffers */ 245/* buffer size for various temporary buffers */
235#define EIO_BUFSIZE 65536 246#define EIO_BUFSIZE 65536
236 247
237#define dBUF \ 248#define dBUF \
238 char *eio_buf; \
239 ETP_WORKER_LOCK (self); \
240 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \ 249 char *eio_buf = malloc (EIO_BUFSIZE); \
241 ETP_WORKER_UNLOCK (self); \
242 errno = ENOMEM; \ 250 errno = ENOMEM; \
243 if (!eio_buf) \ 251 if (!eio_buf) \
244 return -1; 252 return -1
253
254#define FUBd \
255 free (eio_buf)
245 256
246#define EIO_TICKS ((1000000 + 1023) >> 10) 257#define EIO_TICKS ((1000000 + 1023) >> 10)
247 258
248#define ETP_PRI_MIN EIO_PRI_MIN 259#define ETP_PRI_MIN EIO_PRI_MIN
249#define ETP_PRI_MAX EIO_PRI_MAX 260#define ETP_PRI_MAX EIO_PRI_MAX
… …
254#define ETP_DESTROY(req) eio_destroy (req) 265#define ETP_DESTROY(req) eio_destroy (req)
255static int eio_finish (eio_req *req); 266static int eio_finish (eio_req *req);
256#define ETP_FINISH(req) eio_finish (req) 267#define ETP_FINISH(req) eio_finish (req)
257static void eio_execute (struct etp_worker *self, eio_req *req); 268static void eio_execute (struct etp_worker *self, eio_req *req);
258#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 269#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
259
260#define ETP_WORKER_CLEAR(req) \
261 if (wrk->dbuf) \
262 { \
263 free (wrk->dbuf); \
264 wrk->dbuf = 0; \
265 }
266
267#define ETP_WORKER_COMMON \
268 void *dbuf;
269 270
270/*****************************************************************************/ 271/*****************************************************************************/
271 272
272#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 273#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
273 274
… …
315 xthread_t tid; 316 xthread_t tid;
316 317
317 /* locked by reslock, reqlock or wrklock */ 318 /* locked by reslock, reqlock or wrklock */
318 ETP_REQ *req; /* currently processed request */ 319 ETP_REQ *req; /* currently processed request */
319 320
321#ifdef ETP_WORKER_COMMON
320 ETP_WORKER_COMMON 322 ETP_WORKER_COMMON
323#endif
321} etp_worker; 324} etp_worker;
322 325
323static etp_worker wrk_first; /* NOT etp */ 326static etp_worker wrk_first; /* NOT etp */
324 327
325#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 328#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
… …
328/* worker threads management */ 331/* worker threads management */
329 332
330static void ecb_cold 333static void ecb_cold
331etp_worker_clear (etp_worker *wrk) 334etp_worker_clear (etp_worker *wrk)
332{ 335{
333 ETP_WORKER_CLEAR (wrk);
334} 336}
335 337
336static void ecb_cold 338static void ecb_cold
337etp_worker_free (etp_worker *wrk) 339etp_worker_free (etp_worker *wrk)
338{ 340{
… …
939#if !HAVE_FDATASYNC 941#if !HAVE_FDATASYNC
940# undef fdatasync 942# undef fdatasync
941# define fdatasync(fd) fsync (fd) 943# define fdatasync(fd) fsync (fd)
942#endif 944#endif
943 945
946static int
947eio__syncfs (int fd)
948{
949 int res;
950
951#if HAVE_SYS_SYNCFS
952 res = (int)syscall (__NR_syncfs, (int)(fd));
953#else
954 res = -1;
955 errno = ENOSYS;
956#endif
957
958 if (res < 0 && errno == ENOSYS && fd >= 0)
959 sync ();
960
961 return res;
962}
963
944/* sync_file_range always needs emulation */ 964/* sync_file_range always needs emulation */
945static int 965static int
946eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags) 966eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
947{ 967{
948#if HAVE_SYNC_FILE_RANGE 968#if HAVE_SYNC_FILE_RANGE
… …
997 pread (fd, eio_buf, len, offset); 1017 pread (fd, eio_buf, len, offset);
998 offset += len; 1018 offset += len;
999 todo -= len; 1019 todo -= len;
1000 } 1020 }
1001 1021
1022 FUBd;
1023
1002 errno = 0; 1024 errno = 0;
1003 return count; 1025 return count;
1004} 1026}
1005 1027
1006#endif 1028#endif
1007 1029
1008/* sendfile always needs emulation */ 1030/* sendfile always needs emulation */
1009static eio_ssize_t 1031static eio_ssize_t
1010eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self) 1032eio__sendfile (int ofd, int ifd, off_t offset, size_t count)
1011{ 1033{
1012 eio_ssize_t written = 0; 1034 eio_ssize_t written = 0;
1013 eio_ssize_t res; 1035 eio_ssize_t res;
1014 1036
1015 if (!count) 1037 if (!count)
… …
1151 1173
1152 offset += cnt; 1174 offset += cnt;
1153 res += cnt; 1175 res += cnt;
1154 count -= cnt; 1176 count -= cnt;
1155 } 1177 }
1178
1179 FUBd;
1156 } 1180 }
1157 1181
1158 return res; 1182 return res;
1159} 1183}
1160 1184
… …
2025 case EIO_WRITE: req->result = req->offs >= 0 2049 case EIO_WRITE: req->result = req->offs >= 0
2026 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 2050 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
2027 : write (req->int1, req->ptr2, req->size); break; 2051 : write (req->int1, req->ptr2, req->size); break;
2028 2052
2029 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 2053 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
2030 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break; 2054 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
2031 2055
2032 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2056 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2033 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2057 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
2034 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2058 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2035 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2059 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
… …
2065 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break; 2089 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
2066 2090
2067 case EIO_SYNC: req->result = 0; sync (); break; 2091 case EIO_SYNC: req->result = 0; sync (); break;
2068 case EIO_FSYNC: req->result = fsync (req->int1); break; 2092 case EIO_FSYNC: req->result = fsync (req->int1); break;
2069 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2093 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2094 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
2095 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2070 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break; 2096 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
2071 case EIO_MTOUCH: req->result = eio__mtouch (req); break; 2097 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2072 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break; 2098 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2073 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 2099 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2074 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2075 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break; 2100 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2076 2101
2077 case EIO_READDIR: eio__scandir (req, self); break; 2102 case EIO_READDIR: eio__scandir (req, self); break;
2078 2103
2079 case EIO_BUSY: 2104 case EIO_BUSY:
… …
2160eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2185eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2161{ 2186{
2162 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2187 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2163} 2188}
2164 2189
2190eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2191{
2192 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2193}
2194
2195eio_req *eio_syncfs (int fd, int pri, eio_cb cb, void *data)
2196{
2197 REQ (EIO_SYNCFS); req->int1 = fd; SEND;
2198}
2199
2200eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2201{
2202 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2203}
2204
2165eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2205eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2166{ 2206{
2167 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2207 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2168} 2208}
2169 2209
… …
2175eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data) 2215eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
2176{ 2216{
2177 REQ (EIO_MLOCKALL); req->int1 = flags; SEND; 2217 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2178} 2218}
2179 2219
2180eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2181{
2182 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2183}
2184
2185eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data) 2220eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
2186{ 2221{
2187 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND; 2222 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
2188}
2189
2190eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2191{
2192 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2193} 2223}
2194 2224
2195eio_req *eio_close (int fd, int pri, eio_cb cb, void *data) 2225eio_req *eio_close (int fd, int pri, eio_cb cb, void *data)
2196{ 2226{
2197 REQ (EIO_CLOSE); req->int1 = fd; SEND; 2227 REQ (EIO_CLOSE); req->int1 = fd; SEND;
… …
2425/* misc garbage */ 2455/* misc garbage */
2426 2456
2427eio_ssize_t 2457eio_ssize_t
2428eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2458eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2429{ 2459{
2430 etp_worker wrk;
2431 eio_ssize_t ret;
2432
2433 wrk.dbuf = 0;
2434
2435 ret = eio__sendfile (ofd, ifd, offset, count, &wrk); 2460 return eio__sendfile (ofd, ifd, offset, count);
2436
2437 if (wrk.dbuf)
2438 free (wrk.dbuf);
2439
2440 return ret;
2441} 2461}
2442 2462

Diff Legend

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