mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

posix-aio: merge posix_aio_process_queue and posix_aio_read

Browse Source 
posix_aio_read already calls qemu_aio_process_queue, and dually
qemu_aio_process_queue is always followed by a select loop that calls
posix_aio_read.

No races are possible, so there is no need for a separate process_queue
callback.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Paolo Bonzini 2012-04-12 14:00:53 +02:00 committed by Kevin Wolf
parent 8a83205d34
commit adfe92f6d1
1 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
posix-aio-compat.c
View File

@ -468,26 +468,37 @@ static int qemu_paio_error(struct qemu_paiocb *aiocb)
return ret; return ret;
} }
static int posix_aio_process_queue(void *opaque) static void posix_aio_read(void *opaque)
{ {
PosixAioState *s = opaque; PosixAioState *s = opaque;
struct qemu_paiocb *acb, **pacb; struct qemu_paiocb *acb, **pacb;
int ret; int ret;
int result = 0; ssize_t len;
/* read all bytes from signal pipe */
for (;;) {
char bytes[16];
len = read(s->rfd, bytes, sizeof(bytes));
if (len == -1 && errno == EINTR)
continue; /* try again */
if (len == sizeof(bytes))
continue; /* more to read */
break;
}
for(;;) { for(;;) {
pacb = &s->first_aio; pacb = &s->first_aio;
for(;;) { for(;;) {
acb = *pacb; acb = *pacb;
if (!acb) if (!acb)
return result; return;
ret = qemu_paio_error(acb); ret = qemu_paio_error(acb);
if (ret == ECANCELED) { if (ret == ECANCELED) {
/* remove the request */ /* remove the request */
*pacb = acb->next; *pacb = acb->next;
qemu_aio_release(acb); qemu_aio_release(acb);
result = 1;
} else if (ret != EINPROGRESS) { } else if (ret != EINPROGRESS) {
/* end of aio */ /* end of aio */
if (ret == 0) { if (ret == 0) {
@ -507,35 +518,12 @@ static int posix_aio_process_queue(void *opaque)
/* call the callback */ /* call the callback */
acb->common.cb(acb->common.opaque, ret); acb->common.cb(acb->common.opaque, ret);
qemu_aio_release(acb); qemu_aio_release(acb);
result = 1;
break; break;
} else { } else {
pacb = &acb->next; pacb = &acb->next;
} }
} }
} }
return result;
}
static void posix_aio_read(void *opaque)
{
PosixAioState *s = opaque;
ssize_t len;
/* read all bytes from signal pipe */
for (;;) {
char bytes[16];
len = read(s->rfd, bytes, sizeof(bytes));
if (len == -1 && errno == EINTR)
continue; /* try again */
if (len == sizeof(bytes))
continue; /* more to read */
break;
}
posix_aio_process_queue(s);
} }
static int posix_aio_flush(void *opaque) static int posix_aio_flush(void *opaque)
@ -676,7 +664,7 @@ int paio_init(void)
fcntl(s->wfd, F_SETFL, O_NONBLOCK); fcntl(s->wfd, F_SETFL, O_NONBLOCK);
qemu_aio_set_fd_handler(s->rfd, posix_aio_read, NULL, posix_aio_flush, qemu_aio_set_fd_handler(s->rfd, posix_aio_read, NULL, posix_aio_flush,
posix_aio_process_queue, s); NULL, s);
ret = pthread_attr_init(&attr); ret = pthread_attr_init(&attr);
if (ret) if (ret)