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.96 by root, Tue Jul 19 05:20:36 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>
… …
233 240
234/* buffer size for various temporary buffers */ 241/* buffer size for various temporary buffers */
235#define EIO_BUFSIZE 65536 242#define EIO_BUFSIZE 65536
236 243
237#define dBUF \ 244#define dBUF \
238 char *eio_buf; \
239 ETP_WORKER_LOCK (self); \
240 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \ 245 char *eio_buf = malloc (EIO_BUFSIZE); \
241 ETP_WORKER_UNLOCK (self); \
242 errno = ENOMEM; \ 246 errno = ENOMEM; \
243 if (!eio_buf) \ 247 if (!eio_buf) \
244 return -1; 248 return -1
249
250#define FUBd \
251 free (eio_buf)
245 252
246#define EIO_TICKS ((1000000 + 1023) >> 10) 253#define EIO_TICKS ((1000000 + 1023) >> 10)
247 254
248#define ETP_PRI_MIN EIO_PRI_MIN 255#define ETP_PRI_MIN EIO_PRI_MIN
249#define ETP_PRI_MAX EIO_PRI_MAX 256#define ETP_PRI_MAX EIO_PRI_MAX
… …
254#define ETP_DESTROY(req) eio_destroy (req) 261#define ETP_DESTROY(req) eio_destroy (req)
255static int eio_finish (eio_req *req); 262static int eio_finish (eio_req *req);
256#define ETP_FINISH(req) eio_finish (req) 263#define ETP_FINISH(req) eio_finish (req)
257static void eio_execute (struct etp_worker *self, eio_req *req); 264static void eio_execute (struct etp_worker *self, eio_req *req);
258#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 265#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 266
270/*****************************************************************************/ 267/*****************************************************************************/
271 268
272#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 269#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
273 270
… …
315 xthread_t tid; 312 xthread_t tid;
316 313
317 /* locked by reslock, reqlock or wrklock */ 314 /* locked by reslock, reqlock or wrklock */
318 ETP_REQ *req; /* currently processed request */ 315 ETP_REQ *req; /* currently processed request */
319 316
317#ifdef ETP_WORKER_COMMON
320 ETP_WORKER_COMMON 318 ETP_WORKER_COMMON
319#endif
321} etp_worker; 320} etp_worker;
322 321
323static etp_worker wrk_first; /* NOT etp */ 322static etp_worker wrk_first; /* NOT etp */
324 323
325#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 324#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
… …
328/* worker threads management */ 327/* worker threads management */
329 328
330static void ecb_cold 329static void ecb_cold
331etp_worker_clear (etp_worker *wrk) 330etp_worker_clear (etp_worker *wrk)
332{ 331{
333 ETP_WORKER_CLEAR (wrk);
334} 332}
335 333
336static void ecb_cold 334static void ecb_cold
337etp_worker_free (etp_worker *wrk) 335etp_worker_free (etp_worker *wrk)
338{ 336{
… …
997 pread (fd, eio_buf, len, offset); 995 pread (fd, eio_buf, len, offset);
998 offset += len; 996 offset += len;
999 todo -= len; 997 todo -= len;
1000 } 998 }
1001 999
1000 FUBd;
1001
1002 errno = 0; 1002 errno = 0;
1003 return count; 1003 return count;
1004} 1004}
1005 1005
1006#endif 1006#endif
1007 1007
1008/* sendfile always needs emulation */ 1008/* sendfile always needs emulation */
1009static eio_ssize_t 1009static eio_ssize_t
1010eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self) 1010eio__sendfile (int ofd, int ifd, off_t offset, size_t count)
1011{ 1011{
1012 eio_ssize_t written = 0; 1012 eio_ssize_t written = 0;
1013 eio_ssize_t res; 1013 eio_ssize_t res;
1014 1014
1015 if (!count) 1015 if (!count)
… …
1151 1151
1152 offset += cnt; 1152 offset += cnt;
1153 res += cnt; 1153 res += cnt;
1154 count -= cnt; 1154 count -= cnt;
1155 } 1155 }
1156
1157 FUBd;
1156 } 1158 }
1157 1159
1158 return res; 1160 return res;
1159} 1161}
1160 1162
… …
2025 case EIO_WRITE: req->result = req->offs >= 0 2027 case EIO_WRITE: req->result = req->offs >= 0
2026 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 2028 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
2027 : write (req->int1, req->ptr2, req->size); break; 2029 : write (req->int1, req->ptr2, req->size); break;
2028 2030
2029 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 2031 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; 2032 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
2031 2033
2032 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2034 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2033 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2035 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
2034 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2036 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2035 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2037 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
… …
2425/* misc garbage */ 2427/* misc garbage */
2426 2428
2427eio_ssize_t 2429eio_ssize_t
2428eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2430eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2429{ 2431{
2430 etp_worker wrk;
2431 eio_ssize_t ret;
2432
2433 wrk.dbuf = 0;
2434
2435 ret = eio__sendfile (ofd, ifd, offset, count, &wrk); 2432 return eio__sendfile (ofd, ifd, offset, count);
2436
2437 if (wrk.dbuf)
2438 free (wrk.dbuf);
2439
2440 return ret;
2441} 2433}
2442 2434

Diff Legend

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