Skip to content

Commit

Permalink
main-loop: For tools, initialize timers as part of qemu_init_main_loop()
Browse files Browse the repository at this point in the history
In some cases initializing the alarm timers can lead to non-negligable
overhead from programs that link against qemu-tool.o. At least,
setting a max-resolution WinMM alarm timer via mm_start_timer() (the
current default for Windows) can increase the "tick rate" on Windows
OSs and affect frequency scaling, and in the case of tools that run
in guest OSs such has qemu-ga, the impact can be fairly dramatic
(+20%/20% user/sys time on a core 2 processor was observed from an idle
Windows XP guest).

This patch doesn't address the issue directly (not sure what a good
solution would be for Windows, or what other situations it might be
noticeable), but it at least limits the scope of the issue to programs
that "opt-in" to using the main-loop.c functions by only enabling alarm
timers when qemu_init_main_loop() is called, which is already required
to make use of those facilities, so existing users shouldn't be
affected.

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
  • Loading branch information
mdroth authored and Anthony Liguori committed Feb 1, 2012
1 parent ee77dfb commit d34e8f6
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 2 deletions.
2 changes: 1 addition & 1 deletion main-loop.c
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ static int qemu_signal_init(void)
}
#endif

int qemu_init_main_loop(void)
int main_loop_init(void)
{
int ret;

Expand Down
12 changes: 12 additions & 0 deletions main-loop.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,21 @@
* SIGUSR2, thread signals (SIGFPE, SIGILL, SIGSEGV, SIGBUS) and real-time
* signals if available. Remember that Windows in practice does not have
* signals, though.
*
* In the case of QEMU tools, this will also start/initialize timers.
*/
int qemu_init_main_loop(void);

/**
* main_loop_init: Initializes main loop
*
* Internal (but shared for compatibility reasons) initialization routine
* for the main loop. This should not be used by applications directly,
* use qemu_init_main_loop() instead.
*
*/
int main_loop_init(void);

/**
* main_loop_wait: Run one iteration of the main loop.
*
Expand Down
3 changes: 2 additions & 1 deletion qemu-tool.c
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,12 @@ void qemu_clock_warp(QEMUClock *clock)
{
}

static void __attribute__((constructor)) init_main_loop(void)
int qemu_init_main_loop(void)
{
init_clocks();
init_timer_alarm();
qemu_clock_enable(vm_clock, false);
return main_loop_init();
}

void slirp_select_fill(int *pnfds, fd_set *readfds,
Expand Down
5 changes: 5 additions & 0 deletions vl.c
Original file line number Diff line number Diff line change
Expand Up @@ -2167,6 +2167,11 @@ static void free_and_trace(gpointer mem)
free(mem);
}

int qemu_init_main_loop(void)
{
return main_loop_init();
}

int main(int argc, char **argv, char **envp)
{
const char *gdbstub_dev = NULL;
Expand Down

0 comments on commit d34e8f6

Please sign in to comment.