david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use a single select for slirp and qemu sockets

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1887 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
bellard 2006-05-01 13:33:02 +00:00
parent 29e3055c37
commit e035649ea3
1 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
vl.c
View File

@ -4409,7 +4409,7 @@ void qemu_system_powerdown_request(void)
void main_loop_wait(int timeout) void main_loop_wait(int timeout)
{ {
IOHandlerRecord *ioh, *ioh_next; IOHandlerRecord *ioh, *ioh_next;
fd_set rfds, wfds; fd_set rfds, wfds, xfds;
int ret, nfds; int ret, nfds;
struct timeval tv; struct timeval tv;
PollingEntry *pe; PollingEntry *pe;
@ -4444,6 +4444,7 @@ void main_loop_wait(int timeout)
nfds = -1; nfds = -1;
FD_ZERO(&rfds); FD_ZERO(&rfds);
FD_ZERO(&wfds); FD_ZERO(&wfds);
FD_ZERO(&xfds);
for(ioh = first_io_handler; ioh != NULL; ioh = ioh->next) { for(ioh = first_io_handler; ioh != NULL; ioh = ioh->next) {
if (ioh->fd_read && if (ioh->fd_read &&
(!ioh->fd_read_poll || (!ioh->fd_read_poll ||
@ -4465,7 +4466,12 @@ void main_loop_wait(int timeout)
#else #else
tv.tv_usec = timeout * 1000; tv.tv_usec = timeout * 1000;
#endif #endif
ret = select(nfds + 1, &rfds, &wfds, NULL, &tv); #if defined(CONFIG_SLIRP)
if (slirp_inited) {
slirp_select_fill(&nfds, &rfds, &wfds, &xfds);
}
#endif
ret = select(nfds + 1, &rfds, &wfds, &xfds, &tv);
if (ret > 0) { if (ret > 0) {
/* XXX: better handling of removal */ /* XXX: better handling of removal */
for(ioh = first_io_handler; ioh != NULL; ioh = ioh_next) { for(ioh = first_io_handler; ioh != NULL; ioh = ioh_next) {
@ -4478,29 +4484,18 @@ void main_loop_wait(int timeout)
} }
} }
} }
#ifdef _WIN32
tap_win32_poll();
#endif
#if defined(CONFIG_SLIRP) #if defined(CONFIG_SLIRP)
/* XXX: merge with the previous select() */
if (slirp_inited) { if (slirp_inited) {
fd_set rfds, wfds, xfds; if (ret < 0) {
int nfds;
struct timeval tv;
nfds = -1;
FD_ZERO(&rfds); FD_ZERO(&rfds);
FD_ZERO(&wfds); FD_ZERO(&wfds);
FD_ZERO(&xfds); FD_ZERO(&xfds);
slirp_select_fill(&nfds, &rfds, &wfds, &xfds); }
tv.tv_sec = 0;
tv.tv_usec = 0;
ret = select(nfds + 1, &rfds, &wfds, &xfds, &tv);
if (ret >= 0) {
slirp_select_poll(&rfds, &wfds, &xfds); slirp_select_poll(&rfds, &wfds, &xfds);
} }
} #endif
#ifdef _WIN32
tap_win32_poll();
#endif #endif
if (vm_running) { if (vm_running) {