Patchwork qemu-timer: simplify qemu_run_timers

login
register
mail settings
Submitter Paolo Bonzini
Date Sept. 19, 2012, 1:52 p.m.
Message ID <1348062764-30806-1-git-send-email-pbonzini@redhat.com>
Download mbox | patch
Permalink /patch/185046/
State New
Headers show

Comments

Paolo Bonzini - Sept. 19, 2012, 1:52 p.m.
ptimer_head is an invariant pointer to clock->active_timers.
Remove it, and just reference clock->active_timers directly.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 qemu-timer.c | 7 +++----
 1 file modificato, 3 inserzioni(+), 4 rimozioni(-)
Stefan Hajnoczi - Sept. 22, 2012, 4:22 p.m.
On Wed, Sep 19, 2012 at 03:52:44PM +0200, Paolo Bonzini wrote:
> ptimer_head is an invariant pointer to clock->active_timers.
> Remove it, and just reference clock->active_timers directly.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  qemu-timer.c | 7 +++----
>  1 file modificato, 3 inserzioni(+), 4 rimozioni(-)

qemu_run_timers() is a piece of code that I always have to read
line-by-line.  This simplification helps a bit, nice.

Thanks, applied to the trivial patches tree:
https://github.com/stefanha/qemu/commits/trivial-patches

Stefan

Patch

diff --git a/qemu-timer.c b/qemu-timer.c
index c7a1551..908a103 100644
--- a/qemu-timer.c
+++ b/qemu-timer.c
@@ -372,21 +372,20 @@  bool qemu_timer_expired(QEMUTimer *timer_head, int64_t current_time)
 
 void qemu_run_timers(QEMUClock *clock)
 {
-    QEMUTimer **ptimer_head, *ts;
+    QEMUTimer *ts;
     int64_t current_time;
    
     if (!clock->enabled)
         return;
 
     current_time = qemu_get_clock_ns(clock);
-    ptimer_head = &clock->active_timers;
     for(;;) {
-        ts = *ptimer_head;
+        ts = clock->active_timers;
         if (!qemu_timer_expired_ns(ts, current_time)) {
             break;
         }
         /* remove timer from the list before calling the callback */
-        *ptimer_head = ts->next;
+        clock->active_timers = ts->next;
         ts->next = NULL;
 
         /* run the callback (the timer list can be modified) */