From patchwork Tue Mar 15 14:30:18 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: 63877 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp704447lbc; Tue, 15 Mar 2016 07:35:10 -0700 (PDT) X-Received: by 10.140.143.134 with SMTP id 128mr30168374qhp.25.1458052510552; Tue, 15 Mar 2016 07:35:10 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id w74si26702819qgw.78.2016.03.15.07.35.10 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 15 Mar 2016 07:35:10 -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; 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]:48616 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afq3x-00085S-Jr for patch@linaro.org; Tue, 15 Mar 2016 10:35:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48255) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afpzY-0000yk-80 for qemu-devel@nongnu.org; Tue, 15 Mar 2016 10:30:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1afpzW-0005Kv-RZ for qemu-devel@nongnu.org; Tue, 15 Mar 2016 10:30:36 -0400 Received: from mail-wm0-x22a.google.com ([2a00:1450:400c:c09::22a]:34571) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afpzW-0005Ki-Ka for qemu-devel@nongnu.org; Tue, 15 Mar 2016 10:30:34 -0400 Received: by mail-wm0-x22a.google.com with SMTP id p65so147341627wmp.1 for ; Tue, 15 Mar 2016 07:30:34 -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=ijmlevqsj4/fxJDAHkT2qHDgNvh53mdRyjd0opGW5uA=; b=IA3fNvTn9clCWUxy+D5cM0umAje8J0GNPdol0OM0dytxvpf8ezu2JMNCApVL2qLJ8K Q8bmkgwEB4EClJbhAXkzQDCKHVYwLxbH6clrOqht3xV+zkuR7DUkRWF03x0srSVCB/Uf 7luMiEnMQUzOftwGJdQyFa6qlg+4gexYBqt5Q= 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=ijmlevqsj4/fxJDAHkT2qHDgNvh53mdRyjd0opGW5uA=; b=PIhjIb6XJi+EdPtC8RvX0mo8zyjUhyILaqTZy/n+AAlO3eeVdjpM0aj5d4ejG9DWBZ KQrEPAMzSnh2wtWWRIUBQTclRd0fB7J0s5D+2iJimrdt8W9pjkzPwuRI8QEmK6UzgrIW hGzX3qhCTMscUbniLpcdBP6QLuMzk9df2XgbnPSgp1TsjJl77TqH7DL6G6HYK1Nsg33o djO7juToQNhXPH9KGiC+Fknl8jLJssoZymaKdT5knhpg9btcr0k+CATJxT42dNCXJrv5 TOBCjaZpyIy1CzrpvzLGxo+oAVu2+e22ND8YUtew/KAR8M32Rg80jGV8trX6fvLhU2w7 4+xw== X-Gm-Message-State: AD7BkJK+sbLf9aiyqaiAPcZXyTAN2GaA5PabpdcYEu5UGsF37F66kLBp5kocPlQDe1cW+jfJ X-Received: by 10.194.142.135 with SMTP id rw7mr28946305wjb.84.1458052234027; Tue, 15 Mar 2016 07:30:34 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id k125sm21023141wmb.14.2016.03.15.07.30.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Mar 2016 07:30:31 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id A47513E044B; Tue, 15 Mar 2016 14:30:27 +0000 (GMT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 15 Mar 2016 14:30:18 +0000 Message-Id: <1458052224-9316-5-git-send-email-alex.bennee@linaro.org> X-Mailer: git-send-email 2.7.2 In-Reply-To: <1458052224-9316-1-git-send-email-alex.bennee@linaro.org> References: <1458052224-9316-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::22a Cc: Peter Maydell , crosthwaitepeter@gmail.com, pbonzini@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net, rth@twiddle.net Subject: [Qemu-devel] [PATCH v9 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.2 diff --git a/include/qemu/log.h b/include/qemu/log.h index 40c24fd..523c886 100644 --- a/include/qemu/log.h +++ b/include/qemu/log.h @@ -66,10 +66,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 a14d480..4e69586 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) {