From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753506AbbALQ1m (ORCPT ); Mon, 12 Jan 2015 11:27:42 -0500 Received: from mail.kernel.org ([198.145.29.136]:34837 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751952AbbALQ1k (ORCPT ); Mon, 12 Jan 2015 11:27:40 -0500 Date: Mon, 12 Jan 2015 13:27:36 -0300 From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Peter Zijlstra , Jiri Olsa , LKML , Kan Liang , Jiri Olsa Subject: Re: [PATCH 5/7] perf tools: Pass struct perf_hpp_fmt to its callbacks Message-ID: <20150112162736.GL12406@kernel.org> References: <1420677949-6719-1-git-send-email-namhyung@kernel.org> <1420677949-6719-6-git-send-email-namhyung@kernel.org> <20150112162140.GK12406@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20150112162140.GK12406@kernel.org> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Mon, Jan 12, 2015 at 01:21:40PM -0300, Arnaldo Carvalho de Melo escreveu: > Em Thu, Jan 08, 2015 at 09:45:46AM +0900, Namhyung Kim escreveu: > > Currently ->cmp, ->collapse and ->sort callbacks doesn't pass > > corresponding fmt. But it'll be needed by upcoming changes in > > perf diff command. > > > > Suggested-by: Jiri Olsa > > > CC /tmp/build/perf/builtin-evlist.o > builtin-diff.c: In function ‘data__hpp_register’: > builtin-diff.c:1036:11: error: assignment from incompatible pointer type [-Werror] > fmt->cmp = hist_entry__cmp_nop; > ^ > builtin-diff.c:1037:16: error: assignment from incompatible pointer type [-Werror] > fmt->collapse = hist_entry__cmp_nop; > ^ > builtin-diff.c:1043:13: error: assignment from incompatible pointer type [-Werror] > fmt->sort = hist_entry__cmp_baseline; > ^ > builtin-diff.c:1047:13: error: assignment from incompatible pointer type [-Werror] > fmt->sort = hist_entry__cmp_delta; > ^ > builtin-diff.c:1051:13: error: assignment from incompatible pointer type [-Werror] > fmt->sort = hist_entry__cmp_ratio; > ^ > builtin-diff.c:1055:13: error: assignment from incompatible pointer type [-Werror] > fmt->sort = hist_entry__cmp_wdiff; > ^ > builtin-diff.c:1058:13: error: assignment from incompatible pointer type [-Werror] > fmt->sort = hist_entry__cmp_nop; > ^ > cc1: all warnings being treated as errors > LINK plugin_kvm.so > make[1]: *** [/tmp/build/perf/builtin-diff.o] Error 1 > make[1]: *** Waiting for unfinished jobs.... > LINK plugin_mac80211.so Am I missing something? Lemme continue trying applying the rest of the kit... - Arnaldo diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c index ae8f62151b34..4816989a84b0 100644 --- a/tools/perf/builtin-diff.c +++ b/tools/perf/builtin-diff.c @@ -554,14 +554,16 @@ hist_entry__cmp_compute(struct hist_entry *left, struct hist_entry *right, } static int64_t -hist_entry__cmp_nop(struct hist_entry *left __maybe_unused, +hist_entry__cmp_nop(struct perf_hpp_fmt *fmt __maybe_unused, + struct hist_entry *left __maybe_unused, struct hist_entry *right __maybe_unused) { return 0; } static int64_t -hist_entry__cmp_baseline(struct hist_entry *left, struct hist_entry *right) +hist_entry__cmp_baseline(struct perf_hpp_fmt *fmt __maybe_unused, + struct hist_entry *left, struct hist_entry *right) { if (sort_compute) return 0; @@ -572,19 +574,22 @@ hist_entry__cmp_baseline(struct hist_entry *left, struct hist_entry *right) } static int64_t -hist_entry__cmp_delta(struct hist_entry *left, struct hist_entry *right) +hist_entry__cmp_delta(struct perf_hpp_fmt *fmt __maybe_unused, + struct hist_entry *left, struct hist_entry *right) { return hist_entry__cmp_compute(right, left, COMPUTE_DELTA); } static int64_t -hist_entry__cmp_ratio(struct hist_entry *left, struct hist_entry *right) +hist_entry__cmp_ratio(struct perf_hpp_fmt *fmt __maybe_unused, + struct hist_entry *left, struct hist_entry *right) { return hist_entry__cmp_compute(right, left, COMPUTE_RATIO); } static int64_t -hist_entry__cmp_wdiff(struct hist_entry *left, struct hist_entry *right) +hist_entry__cmp_wdiff(struct perf_hpp_fmt *fmt __maybe_unused, + struct hist_entry *left, struct hist_entry *right) { return hist_entry__cmp_compute(right, left, COMPUTE_WEIGHTED_DIFF); }