From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755156Ab3K0LNJ (ORCPT ); Wed, 27 Nov 2013 06:13:09 -0500 Received: from mail-pd0-f172.google.com ([209.85.192.172]:47248 "EHLO mail-pd0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754620Ab3K0LMZ (ORCPT ); Wed, 27 Nov 2013 06:12:25 -0500 From: Ramkumar Ramachandra To: LKML Cc: Arnaldo Carvalho de Melo , Jiri Olsa , Namhyung Kim Subject: [PATCH v3 2/4] perf diff: generalize hpp__color_delta for -c Date: Wed, 27 Nov 2013 16:32:32 +0530 Message-Id: <1385550154-11385-3-git-send-email-artagnon@gmail.com> X-Mailer: git-send-email 1.8.5.rc0.5.g70ebc73.dirty In-Reply-To: <1385550154-11385-1-git-send-email-artagnon@gmail.com> References: <1385550154-11385-1-git-send-email-artagnon@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Generalize the function so that we can accommodate all three comparison methods: delta, ratio, and wdiff. Cc: Jiri Olsa Cc: Namhyung Kim Cc: Arnaldo Carvalho de Melo Signed-off-by: Ramkumar Ramachandra --- tools/perf/builtin-diff.c | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c index fe6e200..20284c3 100644 --- a/tools/perf/builtin-diff.c +++ b/tools/perf/builtin-diff.c @@ -769,31 +769,44 @@ static int hpp__entry_baseline(struct hist_entry *he, char *buf, size_t size) return ret; } -static int hpp__color_delta(struct perf_hpp_fmt *fmt, - struct perf_hpp *hpp, struct hist_entry *he) +static int __hpp__color_compare(struct perf_hpp_fmt *fmt, + struct perf_hpp *hpp, struct hist_entry *he, + int comparison_method) { struct diff_hpp_fmt *dfmt = container_of(fmt, struct diff_hpp_fmt, fmt); struct hist_entry *pair = get_pair_fmt(he, dfmt); - double percent; + double diff; char pfmt[20] = " "; if (!pair) goto dummy_print; - if (pair->diff.computed) - percent = pair->diff.period_ratio_delta; - else - percent = compute_delta(he, pair); - if (fabs(percent) >= 0.01) { + switch(comparison_method){ + case COMPUTE_DELTA: + if (pair->diff.computed) + diff = pair->diff.period_ratio_delta; + else + diff = compute_delta(he, pair); + + if (fabs(diff) < 0.01) + goto dummy_print; scnprintf(pfmt, 20, "%%%+d.2f%%%%", dfmt->header_width - 1); return color_snprintf(hpp->buf, hpp->size, - percent > 0 ? PERF_COLOR_GREEN : PERF_COLOR_RED, - pfmt, percent); - } else + diff > 0 ? PERF_COLOR_GREEN : PERF_COLOR_RED, + pfmt, diff); + default: + BUG_ON(1); + } dummy_print: - return scnprintf(hpp->buf, hpp->size, "%*s", - dfmt->header_width, pfmt); + return scnprintf(hpp->buf, hpp->size, "%*s", + dfmt->header_width, pfmt); +} + +static int hpp__color_delta(struct perf_hpp_fmt *fmt, + struct perf_hpp *hpp, struct hist_entry *he) +{ + return __hpp__color_compare(fmt, hpp, he, COMPUTE_DELTA); } static void -- 1.8.5.rc0.5.g70ebc73.dirty