From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755758AbcIEL6v (ORCPT ); Mon, 5 Sep 2016 07:58:51 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36590 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755351AbcIEL6t (ORCPT ); Mon, 5 Sep 2016 07:58:49 -0400 Date: Mon, 5 Sep 2016 04:57:26 -0700 From: tip-bot for Josh Poimboeuf Message-ID: Cc: mgorman@techsingularity.net, mingo@kernel.org, peterz@infradead.org, srikar@linux.vnet.ibm.com, tglx@linutronix.de, matt@codeblueprint.co.uk, linux-kernel@vger.kernel.org, jpoimboe@redhat.com, hpa@zytor.com, torvalds@linux-foundation.org Reply-To: mingo@kernel.org, peterz@infradead.org, mgorman@techsingularity.net, srikar@linux.vnet.ibm.com, tglx@linutronix.de, matt@codeblueprint.co.uk, linux-kernel@vger.kernel.org, jpoimboe@redhat.com, hpa@zytor.com, torvalds@linux-foundation.org In-Reply-To: <3bb1d2367d041fee333b0dde17171e709395b675.1466184592.git.jpoimboe@redhat.com> References: <3bb1d2367d041fee333b0dde17171e709395b675.1466184592.git.jpoimboe@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] sched/debug: Rename 'schedstat_val()' -> 'schedstat_val_or_zero()' Git-Commit-ID: 20e1d4863bfa7152e98f94e5bcdda3e7db41d899 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 20e1d4863bfa7152e98f94e5bcdda3e7db41d899 Gitweb: http://git.kernel.org/tip/20e1d4863bfa7152e98f94e5bcdda3e7db41d899 Author: Josh Poimboeuf AuthorDate: Fri, 17 Jun 2016 12:43:25 -0500 Committer: Ingo Molnar CommitDate: Mon, 5 Sep 2016 13:29:46 +0200 sched/debug: Rename 'schedstat_val()' -> 'schedstat_val_or_zero()' The schedstat_val() macro's behavior is kind of surprising: when schedstat is runtime disabled, it returns zero. Rename it to schedstat_val_or_zero(). There's also a need for a similar macro which doesn't have the 'if (schedstat_enable())' check, to avoid doing the check twice. Create a new 'schedstat_val()' macro for that. Signed-off-by: Josh Poimboeuf Signed-off-by: Peter Zijlstra (Intel) Cc: Linus Torvalds Cc: Matt Fleming Cc: Mel Gorman Cc: Peter Zijlstra Cc: Srikar Dronamraju Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/3bb1d2367d041fee333b0dde17171e709395b675.1466184592.git.jpoimboe@redhat.com Signed-off-by: Ingo Molnar --- kernel/sched/debug.c | 4 ++-- kernel/sched/stats.h | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c index 92fa534..63ffcaa 100644 --- a/kernel/sched/debug.c +++ b/kernel/sched/debug.c @@ -429,9 +429,9 @@ print_task(struct seq_file *m, struct rq *rq, struct task_struct *p) p->prio); SEQ_printf(m, "%9Ld.%06ld %9Ld.%06ld %9Ld.%06ld", - SPLIT_NS(schedstat_val(p->se.statistics.wait_sum)), + SPLIT_NS(schedstat_val_or_zero(p->se.statistics.wait_sum)), SPLIT_NS(p->se.sum_exec_runtime), - SPLIT_NS(schedstat_val(p->se.statistics.sum_sleep_runtime))); + SPLIT_NS(schedstat_val_or_zero(p->se.statistics.sum_sleep_runtime))); #ifdef CONFIG_NUMA_BALANCING SEQ_printf(m, " %d %d", task_node(p), task_numa_group_id(p)); diff --git a/kernel/sched/stats.h b/kernel/sched/stats.h index fc05425..34659a8 100644 --- a/kernel/sched/stats.h +++ b/kernel/sched/stats.h @@ -33,7 +33,8 @@ rq_sched_info_dequeued(struct rq *rq, unsigned long long delta) #define schedstat_inc(var) do { if (schedstat_enabled()) { var++; } } while (0) #define schedstat_add(var, amt) do { if (schedstat_enabled()) { var += (amt); } } while (0) #define schedstat_set(var, val) do { if (schedstat_enabled()) { var = (val); } } while (0) -#define schedstat_val(var) ((schedstat_enabled()) ? (var) : 0) +#define schedstat_val(var) (var) +#define schedstat_val_or_zero(var) ((schedstat_enabled()) ? (var) : 0) #else /* !CONFIG_SCHEDSTATS */ static inline void @@ -50,6 +51,7 @@ rq_sched_info_depart(struct rq *rq, unsigned long long delta) #define schedstat_add(var, amt) do { } while (0) #define schedstat_set(var, val) do { } while (0) #define schedstat_val(var) 0 +#define schedstat_val_or_zero(var) 0 #endif /* CONFIG_SCHEDSTATS */ #ifdef CONFIG_SCHED_INFO