Rooba
/
odyssey
mirror of https://github.com/yandex/odyssey.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

machinarium: fix readahead callback read status

This commit is contained in:
Dmitry Simonenko 2017-04-21 14:52:16 +03:00
parent ee52bd22d7
commit ac30023f1e
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mm_call.h
View File

@ -33,7 +33,7 @@ mm_call_is_active(mm_call_t *call)
static inline int static inline int
mm_call_is_aborted(mm_call_t *call) mm_call_is_aborted(mm_call_t *call)
{ {
return call->status != 0; return call->active && call->status != 0;
} }
static inline void static inline void

17
src/mm_read.c
View File

@ -123,9 +123,12 @@ mm_readahead_cb(mm_fd_t *handle)
if (errno == EINTR) if (errno == EINTR)
continue; continue;
io->readahead_status = errno; io->readahead_status = errno;
call->status = errno;
if (call->fiber) if (mm_call_is_active(call)) {
mm_scheduler_wakeup(call->fiber); call->status = errno;
if (call->fiber)
mm_scheduler_wakeup(call->fiber);
}
return; return;
} }
io->readahead_pos += rc; io->readahead_pos += rc;
@ -136,14 +139,16 @@ mm_readahead_cb(mm_fd_t *handle)
mm_readahead_stop(io); mm_readahead_stop(io);
io->read_eof = 1; io->read_eof = 1;
io->readahead_status = 0; io->readahead_status = 0;
call->status = 0; if (mm_call_is_active(call))
call->status = 0;
break; break;
} }
break; break;
} }
io->readahead_status = 0; io->readahead_status = 0;
call->status = 0;
if (call->fiber) { if (mm_call_is_active(call)) {
call->status = 0;
int ra_left = io->readahead_pos - io->readahead_pos_read; int ra_left = io->readahead_pos - io->readahead_pos_read;
if (io->read_eof || ra_left >= io->read_size) if (io->read_eof || ra_left >= io->read_size)
mm_scheduler_wakeup(call->fiber); mm_scheduler_wakeup(call->fiber);