From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752802AbcAGAMg (ORCPT ); Wed, 6 Jan 2016 19:12:36 -0500 Received: from LGEAMRELO11.lge.com ([156.147.23.51]:50485 "EHLO lgeamrelo11.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752199AbcAGAMb (ORCPT ); Wed, 6 Jan 2016 19:12:31 -0500 X-Original-SENDERIP: 156.147.1.125 X-Original-MAILFROM: namhyung@kernel.org X-Original-SENDERIP: 10.177.227.17 X-Original-MAILFROM: namhyung@kernel.org From: Namhyung Kim To: Arnaldo Carvalho de Melo Cc: Ingo Molnar , Peter Zijlstra , Jiri Olsa , LKML , David Ahern , Steven Rostedt , Frederic Weisbecker , Andi Kleen , Wang Nan Subject: [PATCH v4 2/5] perf tools: Separate hpp->sort callback for dynamic sort keys Date: Thu, 7 Jan 2016 09:12:26 +0900 Message-Id: <1452125549-1511-2-git-send-email-namhyung@kernel.org> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1452125549-1511-1-git-send-email-namhyung@kernel.org> References: <1452125549-1511-1-git-send-email-namhyung@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The ->sort callback is used for final output sorting. As it's called after processing all hist entries, it doesn't need to update dynamic length anymore. Also it needs additional handling to sort them properly (which is the topic of next patch). Signed-off-by: Namhyung Kim --- tools/perf/util/sort.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c index 425097d2a1cd..e8a5cdee3f0d 100644 --- a/tools/perf/util/sort.c +++ b/tools/perf/util/sort.c @@ -1798,6 +1798,30 @@ static int64_t __sort__hde_cmp(struct perf_hpp_fmt *fmt, return memcmp(b->raw_data + offset, a->raw_data + offset, size); } +static int64_t __sort__hde_sort(struct perf_hpp_fmt *fmt, + struct hist_entry *a, struct hist_entry *b) +{ + struct hpp_dynamic_entry *hde; + struct format_field *field; + unsigned offset, size; + + hde = container_of(fmt, struct hpp_dynamic_entry, hpp); + + field = hde->field; + if (field->flags & FIELD_IS_DYNAMIC) { + unsigned long long dyn; + + pevent_read_number_field(field, a->raw_data, &dyn); + offset = dyn & 0xffff; + size = (dyn >> 16) & 0xffff; + } else { + offset = field->offset; + size = field->size; + } + + return memcmp(b->raw_data + offset, a->raw_data + offset, size); +} + bool perf_hpp__is_dynamic_entry(struct perf_hpp_fmt *fmt) { return fmt->cmp == __sort__hde_cmp; @@ -1826,7 +1850,7 @@ __alloc_dynamic_entry(struct perf_evsel *evsel, struct format_field *field) hde->hpp.cmp = __sort__hde_cmp; hde->hpp.collapse = __sort__hde_cmp; - hde->hpp.sort = __sort__hde_cmp; + hde->hpp.sort = __sort__hde_sort; INIT_LIST_HEAD(&hde->hpp.list); INIT_LIST_HEAD(&hde->hpp.sort_list); -- 2.6.4