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

main-loop: Calculate poll timeout using timeout argument

Browse Source 
The timeout argument was unused up to now,
but it can be used to reduce the poll_timeout when it is infinite
(negative value) or larger than timeout.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Stefan Weil 2012-04-29 19:15:02 +02:00 committed by Blue Swirl
parent 1b296044b6
commit 3239ad0469
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main-loop.c
View File

@ -425,7 +425,7 @@ static int os_host_main_loop_wait(uint32_t timeout)
if (nfds >= 0) { if (nfds >= 0) {
ret = select(nfds + 1, &rfds, &wfds, &xfds, &tv0); ret = select(nfds + 1, &rfds, &wfds, &xfds, &tv0);
if (ret != 0) { if (ret != 0) {
/* TODO. */ timeout = 0;
} }
} }
@ -439,6 +439,10 @@ static int os_host_main_loop_wait(uint32_t timeout)
poll_fds[n_poll_fds + i].events = G_IO_IN; poll_fds[n_poll_fds + i].events = G_IO_IN;
} }
if (poll_timeout < 0 || timeout < poll_timeout) {
poll_timeout = timeout;
}
qemu_mutex_unlock_iothread(); qemu_mutex_unlock_iothread();
ret = g_poll(poll_fds, n_poll_fds + w->num, poll_timeout); ret = g_poll(poll_fds, n_poll_fds + w->num, poll_timeout);
qemu_mutex_lock_iothread(); qemu_mutex_lock_iothread();