From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=47764 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q8zNi-0000wF-Nt for qemu-devel@nongnu.org; Sun, 10 Apr 2011 14:29:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q8zNh-0004kJ-75 for qemu-devel@nongnu.org; Sun, 10 Apr 2011 14:29:06 -0400 Received: from moutng.kundenserver.de ([212.227.17.9]:54555) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q8zNg-0004k4-RS for qemu-devel@nongnu.org; Sun, 10 Apr 2011 14:29:05 -0400 From: Stefan Weil Date: Sun, 10 Apr 2011 20:28:40 +0200 Message-Id: <1302460123-25704-2-git-send-email-weil@mail.berlios.de> In-Reply-To: <1302460123-25704-1-git-send-email-weil@mail.berlios.de> References: <1302460123-25704-1-git-send-email-weil@mail.berlios.de> Subject: [Qemu-devel] [PATCH 1/4] qemu-timer: Add and use new function qemu_timer_expired_ns List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Paolo Bonzini , QEMU Developers This simply moves code which is used three times into a new function thus improving readability. Signed-off-by: Stefan Weil --- qemu-timer.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/qemu-timer.c b/qemu-timer.c index 50f1943..c3ad72a 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -177,6 +177,11 @@ struct qemu_alarm_timer { static struct qemu_alarm_timer *alarm_timer; +static bool qemu_timer_expired_ns(QEMUTimer *timer_head, int64_t current_time) +{ + return timer_head && (timer_head->expire_time <= current_time); +} + int qemu_alarm_pending(void) { return alarm_timer->pending; @@ -438,10 +443,9 @@ static void qemu_mod_timer_ns(QEMUTimer *ts, int64_t expire_time) pt = &active_timers[ts->clock->type]; for(;;) { t = *pt; - if (!t) - break; - if (t->expire_time > expire_time) + if (!qemu_timer_expired_ns(t, expire_time)) { break; + } pt = &t->next; } ts->expire_time = expire_time; @@ -478,9 +482,7 @@ int qemu_timer_pending(QEMUTimer *ts) int qemu_timer_expired(QEMUTimer *timer_head, int64_t current_time) { - if (!timer_head) - return 0; - return (timer_head->expire_time <= current_time * timer_head->scale); + return qemu_timer_expired_ns(timer_head, current_time * timer_head->scale); } static void qemu_run_timers(QEMUClock *clock) @@ -495,8 +497,9 @@ static void qemu_run_timers(QEMUClock *clock) ptimer_head = &active_timers[clock->type]; for(;;) { ts = *ptimer_head; - if (!ts || ts->expire_time > current_time) + if (!qemu_timer_expired_ns(ts, current_time)) { break; + } /* remove timer from the list before calling the callback */ *ptimer_head = ts->next; ts->next = NULL; -- 1.7.2.5