From patchwork Thu Oct 27 15:10:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 79719 Delivered-To: patch@linaro.org Received: by 10.80.142.83 with SMTP id 19csp707528edx; Thu, 27 Oct 2016 08:28:05 -0700 (PDT) X-Received: by 10.129.81.78 with SMTP id f75mr4145053ywb.149.1477582084958; Thu, 27 Oct 2016 08:28:04 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id s65si2908232ybb.53.2016.10.27.08.28.04 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 27 Oct 2016 08:28:04 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:42287 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzmb6-0001BL-6C for patch@linaro.org; Thu, 27 Oct 2016 11:28:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42668) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzmKs-0004lt-Rt for qemu-devel@nongnu.org; Thu, 27 Oct 2016 11:11:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bzmKn-0007jZ-W8 for qemu-devel@nongnu.org; Thu, 27 Oct 2016 11:11:18 -0400 Received: from mail-wm0-x233.google.com ([2a00:1450:400c:c09::233]:38688) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1bzmKn-0007i6-OX for qemu-devel@nongnu.org; Thu, 27 Oct 2016 11:11:13 -0400 Received: by mail-wm0-x233.google.com with SMTP id n67so50405003wme.1 for ; Thu, 27 Oct 2016 08:11:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Rr/6Izw1M0VeWU5oCIeLlmyq0UbvEZmpsPBWWXL+lvY=; b=HaXilYyjPDXWVcLNxPMBK7eQVnAIEKFzz/iHbo1gPPF1cQSq/+TN0Xc5zUSijFEyNP 6ue8qCTn/HH3+Tk17eaMYS5wNXth3M4ddxVlqQxzvI8iCkI0VyaNrr6PqGsv/0j4onO3 iCxWMBDWREVkSC1SkpY0sHOL8ySsJkUvhQOIo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Rr/6Izw1M0VeWU5oCIeLlmyq0UbvEZmpsPBWWXL+lvY=; b=DYkF+jrXzFk/zA/TNJl68eiIzL7oZZ9J4Bza9lFDyQ2iw/SywmBFf6QPloQZLu9y4D gXfWTl4x7K9zbcdDJMgFDfoB5jxrObGnYrnuYmDwkYPJNn1U8FNSdTKjYpDXvd/p6etg kUE4afXxqgMRh/72NbVijWvnC6QX6AymP+VIHx5KL+cgoN2Np1KS+8/HMLv+dM58z0/X RFjFYQgYNP+UaR3CUVbHMctkDjdgEQS89/cx9T6Rre4+i7qN66pyQOI4Y1S250romYhM jrAwyAXJhnlu6dyFMnlcO9Fhae+CX4wNPJwYsJ9+oMDQpY0xHkIuJUXTOdQiJMVim787 h3Ug== X-Gm-Message-State: ABUngvf88DgLPRL3rKebQbTgrPAeM6X9eNHG2WMEA5GPftjCShMyhqUgo3mOmEKV3c27hJc8 X-Received: by 10.28.88.73 with SMTP id m70mr15196948wmb.19.1477581072643; Thu, 27 Oct 2016 08:11:12 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id gk6sm8988614wjc.21.2016.10.27.08.11.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Oct 2016 08:11:11 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 6C3F33E03AC; Thu, 27 Oct 2016 16:11:00 +0100 (BST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: pbonzini@redhat.com Date: Thu, 27 Oct 2016 16:10:14 +0100 Message-Id: <20161027151030.20863-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20161027151030.20863-1-alex.bennee@linaro.org> References: <20161027151030.20863-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::233 Subject: [Qemu-devel] [PATCH v5 17/33] cpus: re-factor out handle_icount_deadline X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mttcg@listserver.greensocs.com, peter.maydell@linaro.org, claudio.fontana@huawei.com, nikunj@linux.vnet.ibm.com, Peter Crosthwaite , jan.kiszka@siemens.com, mark.burton@greensocs.com, a.rigo@virtualopensystems.com, qemu-devel@nongnu.org, cota@braap.org, serge.fdrv@gmail.com, bobby.prani@gmail.com, rth@twiddle.net, =?UTF-8?q?Alex=20Benn=C3=A9e?= , fred.konrad@greensocs.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" In preparation for adding a MTTCG thread we re-factor out a bit of what will be common code to handle the QEMU_CLOCK_VIRTUAL expiration. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- v4 - split from exit_request patch --- cpus.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) -- 2.10.1 diff --git a/cpus.c b/cpus.c index aca2a2e..6367772 100644 --- a/cpus.c +++ b/cpus.c @@ -1172,6 +1172,18 @@ static int64_t tcg_get_icount_limit(void) } } +static void handle_icount_deadline(void) +{ + if (use_icount) { + int64_t deadline = + qemu_clock_deadline_ns_all(QEMU_CLOCK_VIRTUAL); + + if (deadline == 0) { + qemu_clock_notify(QEMU_CLOCK_VIRTUAL); + } + } +} + static int tcg_cpu_exec(CPUState *cpu) { int ret; @@ -1310,13 +1322,8 @@ static void *qemu_tcg_cpu_thread_fn(void *arg) /* Pairs with smp_wmb in qemu_cpu_kick. */ atomic_mb_set(&exit_request, 0); - if (use_icount) { - int64_t deadline = qemu_clock_deadline_ns_all(QEMU_CLOCK_VIRTUAL); + handle_icount_deadline(); - if (deadline == 0) { - qemu_clock_notify(QEMU_CLOCK_VIRTUAL); - } - } qemu_tcg_wait_io_event(QTAILQ_FIRST(&cpus)); deal_with_unplugged_cpus(); }