From patchwork Thu Aug 29 12:31:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 270804 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 828EC2C00A1 for ; Thu, 29 Aug 2013 22:33:35 +1000 (EST) Received: from localhost ([::1]:42877 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VF1Pp-0006d9-KO for incoming@patchwork.ozlabs.org; Thu, 29 Aug 2013 08:33:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57721) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VF1Ns-0003uP-24 for qemu-devel@nongnu.org; Thu, 29 Aug 2013 08:31:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VF1Nj-0002Fq-MP for qemu-devel@nongnu.org; Thu, 29 Aug 2013 08:31:32 -0400 Received: from mail-ee0-x235.google.com ([2a00:1450:4013:c00::235]:42131) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VF1Nj-0002F0-7x for qemu-devel@nongnu.org; Thu, 29 Aug 2013 08:31:23 -0400 Received: by mail-ee0-f53.google.com with SMTP id b15so203599eek.26 for ; Thu, 29 Aug 2013 05:31:22 -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=4h/ezdmDwCkTMWk5C/M5bXkKNpvVpCEgwELPY3ZW4mE=; b=ho6gUZl376nxRjXkwO/ntw2tV1bISrLRzzE7TIhl6iGd+9P9X6kZsGouIhL5d88M7L Y8978F44emsyMhIm+SV02IiLFKiZn/1ouN4+NY9mhnPu3QYsQuZo4Qa9v6kJyzlUD//h TIH0l8xr8Q6acXz1/6V1Md5Xz5Qq1baMZGK+647QMu98T5zZ6z3XK36pBSAt0aDn8r2I 2XOdpeW+Md86YoORmoGPf1gcMzg88wuTGDkk6Rl/4dmwJ+O9jeOUyEL7Y2sENLF1IGXC mSs4q8jWxkxNoyuLBXe+HHQ3otS1hlJPn0gQh3tJcpUTxS00lai1DzFGAxu2F28mDb/+ bcKw== X-Received: by 10.14.176.129 with SMTP id b1mr2585974eem.78.1377779482453; Thu, 29 Aug 2013 05:31:22 -0700 (PDT) Received: from yakj.usersys.redhat.com (nat-pool-mxp-t.redhat.com. [209.132.186.18]) by mx.google.com with ESMTPSA id i1sm45727875eeg.0.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 29 Aug 2013 05:31:21 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 29 Aug 2013 14:31:01 +0200 Message-Id: <1377779462-24383-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1377779462-24383-1-git-send-email-pbonzini@redhat.com> References: <1377779462-24383-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:c00::235 Cc: qemulist@gmail.com, stefanha@redhat.com Subject: [Qemu-devel] [RFC PATCH 3/3] qemu-timer: do not take the lock in timer_pending 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 We can deduce the result from expire_time, by making it always -1 if the timer is not in the active_timers list. We need to check against negative times passed to timer_mod_ns; clamping them to zero is not a problem because the only clock that has a zero value at VM startup is QEMU_CLOCK_VIRTUAL, and it is monotonic so it cannot be non-zero. QEMU_CLOCK_HOST, instead, is not monotonic but it cannot go to negative values unless the host time is seriously screwed up and points to the 1960s. Signed-off-by: Paolo Bonzini --- qemu-timer.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/qemu-timer.c b/qemu-timer.c index aa22801..807319a 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -312,6 +312,7 @@ void timer_init(QEMUTimer *ts, ts->cb = cb; ts->opaque = opaque; ts->scale = scale; + ts->expire_time = -1; } void timer_free(QEMUTimer *ts) @@ -324,6 +325,7 @@ static void timer_del_locked(QEMUTimerList *timer_list, QEMUTimer *ts) { QEMUTimer **pt, *t; + ts->expire_time = -1; pt = &timer_list->active_timers; for(;;) { t = *pt; @@ -366,7 +368,7 @@ void timer_mod_ns(QEMUTimer *ts, int64_t expire_time) } pt = &t->next; } - ts->expire_time = expire_time; + ts->expire_time = MAX(expire_time, 0); ts->next = *pt; *pt = ts; qemu_mutex_unlock(&timer_list->active_timers_lock); @@ -386,19 +388,7 @@ void timer_mod(QEMUTimer *ts, int64_t expire_time) bool timer_pending(QEMUTimer *ts) { - QEMUTimerList *timer_list = ts->timer_list; - QEMUTimer *t; - bool found = false; - - qemu_mutex_lock(&timer_list->active_timers_lock); - for (t = timer_list->active_timers; t != NULL; t = t->next) { - if (t == ts) { - found = true; - break; - } - } - qemu_mutex_unlock(&timer_list->active_timers_lock); - return found; + return ts->expire_time >= 0; } bool timer_expired(QEMUTimer *timer_head, int64_t current_time) @@ -430,6 +420,7 @@ bool timerlist_run_timers(QEMUTimerList *timer_list) /* remove timer from the list before calling the callback */ timer_list->active_timers = ts->next; ts->next = NULL; + ts->expire_time = -1; cb = ts->cb; opaque = ts->opaque; qemu_mutex_unlock(&timer_list->active_timers_lock);