From patchwork Tue Oct 8 08:47:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 281361 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 542132C0096 for ; Tue, 8 Oct 2013 19:48:50 +1100 (EST) Received: from localhost ([::1]:35300 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTSyG-0004vv-E3 for incoming@patchwork.ozlabs.org; Tue, 08 Oct 2013 04:48:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41740) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTSxh-0004vF-K1 for qemu-devel@nongnu.org; Tue, 08 Oct 2013 04:48:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VTSxZ-0003a0-4J for qemu-devel@nongnu.org; Tue, 08 Oct 2013 04:48:13 -0400 Received: from mail-ea0-x230.google.com ([2a00:1450:4013:c01::230]:50141) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTSxY-0003Zs-Td for qemu-devel@nongnu.org; Tue, 08 Oct 2013 04:48:05 -0400 Received: by mail-ea0-f176.google.com with SMTP id q16so3832773ead.35 for ; Tue, 08 Oct 2013 01:48:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=3HljcUhKWRNgQYl25SNdtCQmsuxbLYfmEWKV0eFCvLA=; b=HKhFA/dOrl3txWcOVy3+8jeiqsri2wAEh2sLlvElenxkaUS6hJQcKgg4GcqRfukBSf 83NcQDZMkHjXdyyKW0LCXJ8iBZMWtO+PfelbelV5kbMXTc+6ti2rmBStpNHmO4AQ6zAx ci78QRXK5leBkxhYDhDRmj90OBOcK0ae2N07duLWq/Crkajh5OBXlxcXR8stN8M0QLpj on2vSML1OjvPyEdhMfTCphVNfL4wK079r1gWfk9KJtiZ0D1xC6xC8zGW0vJS5S8Kqafq hE9k2DbVKOJXDxxce05veiadYydQUfmvbwRqgAsNrQy6sDlXuqXTDPUeQOG/WjeUvASN xZKw== X-Received: by 10.14.122.132 with SMTP id t4mr763171eeh.20.1381222083997; Tue, 08 Oct 2013 01:48:03 -0700 (PDT) Received: from localhost.localdomain (net-2-39-10-130.cust.dsl.vodafone.it. [2.39.10.130]) by mx.google.com with ESMTPSA id m54sm73201892eex.2.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 08 Oct 2013 01:48:03 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 8 Oct 2013 10:47:31 +0200 Message-Id: <1381222058-16701-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1381222058-16701-1-git-send-email-pbonzini@redhat.com> References: <1381222058-16701-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c01::230 Cc: alex@alex.org.uk Subject: [Qemu-devel] [PATCH 1/8] timers: extract timer_mod_ns_locked and timerlist_rearm X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org These will be reused in timer_mod_anticipate functions. Signed-off-by: Paolo Bonzini Signed-off-by: Alex Bligh --- qemu-timer.c | 51 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/qemu-timer.c b/qemu-timer.c index 6b62e88..95fc6eb 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -338,6 +338,34 @@ static void timer_del_locked(QEMUTimerList *timer_list, QEMUTimer *ts) } } +static bool timer_mod_ns_locked(QEMUTimerList *timer_list, + QEMUTimer *ts, int64_t expire_time) +{ + QEMUTimer **pt, *t; + + /* add the timer in the sorted list */ + pt = &timer_list->active_timers; + for (;;) { + t = *pt; + if (!timer_expired_ns(t, expire_time)) { + break; + } + pt = &t->next; + } + ts->expire_time = MAX(expire_time, 0); + ts->next = *pt; + *pt = ts; + + return pt == &timer_list->active_timers; +} + +static void timerlist_rearm(QEMUTimerList *timer_list) +{ + /* Interrupt execution to force deadline recalculation. */ + qemu_clock_warp(timer_list->clock->type); + timerlist_notify(timer_list); +} + /* stop a timer, but do not dealloc it */ void timer_del(QEMUTimer *ts) { @@ -353,30 +381,15 @@ void timer_del(QEMUTimer *ts) void timer_mod_ns(QEMUTimer *ts, int64_t expire_time) { QEMUTimerList *timer_list = ts->timer_list; - QEMUTimer **pt, *t; + bool rearm; qemu_mutex_lock(&timer_list->active_timers_lock); timer_del_locked(timer_list, ts); - - /* add the timer in the sorted list */ - pt = &timer_list->active_timers; - for(;;) { - t = *pt; - if (!timer_expired_ns(t, expire_time)) { - break; - } - pt = &t->next; - } - ts->expire_time = MAX(expire_time, 0); - ts->next = *pt; - *pt = ts; + rearm = timer_mod_ns_locked(timer_list, ts, expire_time); qemu_mutex_unlock(&timer_list->active_timers_lock); - /* Rearm if necessary */ - if (pt == &timer_list->active_timers) { - /* Interrupt execution to force deadline recalculation. */ - qemu_clock_warp(timer_list->clock->type); - timerlist_notify(timer_list); + if (rearm) { + timerlist_rearm(timer_list); } }