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