From patchwork Thu Feb 11 10:40:59 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: 61720 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp111322lbl; Thu, 11 Feb 2016 02:42:34 -0800 (PST) X-Received: by 10.140.223.9 with SMTP id t9mr57885534qhb.65.1455187352989; Thu, 11 Feb 2016 02:42:32 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id x13si8962745qka.33.2016.02.11.02.42.32 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 11 Feb 2016 02:42:32 -0800 (PST) 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; 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; dkim=fail header.i=@linaro.org Received: from localhost ([::1]:48519 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTohk-0001Pb-GG for patch@linaro.org; Thu, 11 Feb 2016 05:42:32 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59244) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTogj-0000Ge-O6 for qemu-devel@nongnu.org; Thu, 11 Feb 2016 05:41:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aTogi-0004pW-HI for qemu-devel@nongnu.org; Thu, 11 Feb 2016 05:41:29 -0500 Received: from mail-wm0-x22b.google.com ([2a00:1450:400c:c09::22b]:35368) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTogi-0004pM-AM for qemu-devel@nongnu.org; Thu, 11 Feb 2016 05:41:28 -0500 Received: by mail-wm0-x22b.google.com with SMTP id c200so66678149wme.0 for ; Thu, 11 Feb 2016 02:41:28 -0800 (PST) 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-type:content-transfer-encoding; bh=kpkKGCKBkIbHZ8wOD5zMCTf3ugq1FiFcLsGfhUEBGsY=; b=QqGDQgUQx6qmsU+XCpob/qAbadfJmAET+caqZTT7Rx3o/2ZIgqXjnxuZ/iWRymLyzp L0JvTYozL7zbW5s82UI3NiCz0JXZCYwN9dnfJyHtoXRnVcX4mCptKE3QZQri/Z2dUwWS gawmtOARJRZPYTp8oV9Dad2V0avaMCJDC4cBE= 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-type:content-transfer-encoding; bh=kpkKGCKBkIbHZ8wOD5zMCTf3ugq1FiFcLsGfhUEBGsY=; b=HwEw6pqtNEvgzg7Pk1XbMoaMHSUwpaQ9RAhmqtgUGfxggIRSr99hUTdAJ5KDk1zyAs 6cIxyBCHJh5Eb7UThaxR6ybhMQmPG01BKZzU6ZoxF4N5TIcpCqAYW0dBu65+Uh1oDPMp H738/cFNKQFzFOvF+B+vpKq+6RuE/nQaCROPWUNjg2/MEHI9bp+O42Ly3x2puaSuarlc YHPUsenbGocK0AJtnSPM/md4lasQrawLlXka1SUvpAZ3F8NvMSxK07DQpBx+3BjpI2JL JOff9lbtAHjjUgP0Bxivhg/Qk3IobuU6M+GFg8cG3sdQYnm6aVu0oNPl36ZV/tojehEy kS3w== X-Gm-Message-State: AG10YOT6W6LLn2dex+JZQ38ChNUcb7d58f0J7I55nP5C6fGRnZh5EFyUGaDGx/rfYb40mhZB X-Received: by 10.28.52.195 with SMTP id b186mr16504830wma.40.1455187287734; Thu, 11 Feb 2016 02:41:27 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id hm9sm6937217wjb.34.2016.02.11.02.41.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Feb 2016 02:41:24 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id C890D3E01F8; Thu, 11 Feb 2016 10:41:22 +0000 (GMT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 11 Feb 2016 10:40:59 +0000 Message-Id: <1455187265-26631-4-git-send-email-alex.bennee@linaro.org> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1455187265-26631-1-git-send-email-alex.bennee@linaro.org> References: <1455187265-26631-1-git-send-email-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::22b Cc: Peter Maydell , dgilbert@redhat.com, crosthwaitepeter@gmail.com, pbonzini@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net, rth@twiddle.net Subject: [Qemu-devel] [PATCH v6 3/9] qemu-log: Avoid function call for disabled qemu_log_mask logging 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Peter Maydell Make qemu_log_mask() a macro which only calls the function to do the actual work if the logging is enabled. This avoids making a function call in possible fast paths where logging is disabled. Signed-off-by: Peter Maydell Signed-off-by: Alex Bennée Reviewed-by: Andreas Färber --- v4 - fix s-o-b tags, add r-b tag --- include/qemu/log.h | 13 ++++++++++--- util/log.c | 11 ----------- 2 files changed, 10 insertions(+), 14 deletions(-) -- 2.7.0 diff --git a/include/qemu/log.h b/include/qemu/log.h index 30817f7..22c4dec 100644 --- a/include/qemu/log.h +++ b/include/qemu/log.h @@ -70,10 +70,17 @@ qemu_log_vprintf(const char *fmt, va_list va) } } -/* log only if a bit is set on the current loglevel mask +/* log only if a bit is set on the current loglevel mask: + * @mask: bit to check in the mask + * @fmt: printf-style format string + * @args: optional arguments for format string */ -void GCC_FMT_ATTR(2, 3) qemu_log_mask(int mask, const char *fmt, ...); - +#define qemu_log_mask(MASK, FMT, ...) \ + do { \ + if (unlikely(qemu_loglevel_mask(MASK))) { \ + qemu_log(FMT, ## __VA_ARGS__); \ + } \ + } while (0) /* Maintenance: */ diff --git a/util/log.c b/util/log.c index c39fa7f..c89b226 100644 --- a/util/log.c +++ b/util/log.c @@ -38,17 +38,6 @@ void qemu_log(const char *fmt, ...) va_end(ap); } -void qemu_log_mask(int mask, const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - if ((qemu_loglevel & mask) && qemu_logfile) { - vfprintf(qemu_logfile, fmt, ap); - } - va_end(ap); -} - /* enable or disable low levels log */ void do_qemu_set_log(int log_flags, bool use_own_buffers) {