From: Andi Kleen <ak@linux.intel.com>
To: Andi Kleen <andi@firstfloor.org>
Cc: linux-kernel@vger.kernel.org, acme@redhat.com,
peterz@infradead.org, jolsa@redhat.com, eranian@google.com,
mingo@kernel.org, namhyung@kernel.org
Subject: [PATCH] perf, tools: Fix WERROR=1 build with transction flags and fix browser
Date: Wed, 31 Oct 2012 02:02:41 -0700 [thread overview]
Message-ID: <20121031090241.GA28297@tassilo.jf.intel.com> (raw)
In-Reply-To: <1351643663-23828-24-git-send-email-andi@firstfloor.org>
And one additional patch for this one to fix the WERROR=0 build again
---
- Fix the WERROR=1 build by avoiding some warnings
- Add a missing hunk to make the transaction flags display in the browser,
not only in --stdio
Signed-off-by: Andi Kleen <ak@linux.intel.com>
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 5d20e11..41ddcf8 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -582,7 +582,7 @@ static inline char *add_str(char *p, const char *str)
static struct txbit {
unsigned flag;
- char *name;
+ const char *name;
} txbits[] = {
{ PERF_SAMPLE_TXN_ELISION, "EL " },
{ PERF_SAMPLE_TXN_TRANSACTION, "TX " },
@@ -593,7 +593,7 @@ static struct txbit {
{ PERF_SAMPLE_TXN_CAPACITY, "CAP " },
{ PERF_SAMPLE_TXN_MEMORY, "MEM " },
{ PERF_SAMPLE_TXN_MISC, "MISC " },
- {}
+ { 0, NULL }
};
static int hist_entry__transaction_snprintf(struct hist_entry *self, char *bf,
@@ -716,6 +716,8 @@ int sort_dimension__add(const char *tok)
sort__first_dimension = SORT_GLOBAL_WEIGHT;
else if (!strcmp(sd->name, "local_weight"))
sort__first_dimension = SORT_LOCAL_WEIGHT;
+ else if (!strcmp(sd->name, "transaction"))
+ sort__first_dimension = SORT_TRANSACTION;
}
list_add_tail(&sd->entry->list, &hist_entry__sort_list);
--
ak@linux.intel.com -- Speaking for myself only
next prev parent reply other threads:[~2012-10-31 9:02 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-31 0:33 perf PMU support for Haswell v5 Andi Kleen
2012-10-31 0:33 ` [PATCH 01/32] perf, x86: Add PEBSv2 record support Andi Kleen
2012-10-31 0:33 ` [PATCH 02/32] perf, x86: Basic Haswell PMU support v2 Andi Kleen
2012-10-31 0:33 ` [PATCH 03/32] perf, x86: Basic Haswell PEBS support v3 Andi Kleen
2012-10-31 0:33 ` [PATCH 04/32] perf, x86: Support the TSX intx/intx_cp qualifiers v2 Andi Kleen
2012-10-31 0:33 ` [PATCH 05/32] perf, kvm: Support the intx/intx_cp modifiers in KVM arch perfmon emulation v3 Andi Kleen
2012-10-31 10:27 ` Gleb Natapov
2012-10-31 10:32 ` Andi Kleen
2012-10-31 10:38 ` Gleb Natapov
2012-10-31 16:43 ` Andi Kleen
2012-11-01 16:50 ` Andi Kleen
2012-10-31 0:33 ` [PATCH 06/32] perf, x86: Support PERF_SAMPLE_ADDR on Haswell Andi Kleen
2012-10-31 0:33 ` [PATCH 07/32] perf, x86: Support Haswell v4 LBR format Andi Kleen
2012-10-31 0:33 ` [PATCH 08/32] perf, x86: Disable LBR recording for unknown LBR_FMT Andi Kleen
2012-10-31 0:34 ` [PATCH 09/32] perf, x86: Support LBR filtering by INTX/NOTX/ABORT v2 Andi Kleen
2012-10-31 0:34 ` [PATCH 10/32] perf, tools: Add abort_tx,no_tx,in_tx branch filter options to perf record -j v3 Andi Kleen
2012-10-31 0:34 ` [PATCH 11/32] perf, tools: Support sorting by intx, abort branch flags Andi Kleen
2012-10-31 0:34 ` [PATCH 12/32] perf, x86: Support full width counting Andi Kleen
2012-10-31 0:34 ` [PATCH 13/32] perf, x86: Avoid checkpointed counters causing excessive TSX aborts v3 Andi Kleen
2012-10-31 0:34 ` [PATCH 14/32] perf, core: Add a concept of a weightened sample Andi Kleen
2012-10-31 0:34 ` [PATCH 15/32] perf, x86: Support weight samples for PEBS Andi Kleen
2012-10-31 0:34 ` [PATCH 16/32] perf, tools: Add support for weight v3 Andi Kleen
2012-10-31 0:34 ` [PATCH 17/32] perf, tools: Handle XBEGIN like a jump Andi Kleen
2012-11-14 6:35 ` [tip:perf/core] perf annotate: " tip-bot for Andi Kleen
2012-10-31 0:34 ` [PATCH 18/32] perf, x86: Support for printing PMU state on spurious PMIs v3 Andi Kleen
2012-10-31 0:34 ` [PATCH 19/32] perf, core: Add generic transaction flags v2 Andi Kleen
2012-10-31 0:34 ` [PATCH 20/32] perf, x86: Add Haswell specific transaction flag reporting Andi Kleen
2012-10-31 0:34 ` [PATCH 21/32] perf, tools: Add support for record transaction flags v2 Andi Kleen
2012-10-31 0:34 ` [PATCH 22/32] perf, tools: Point --sort documentation to --help Andi Kleen
2012-10-31 0:34 ` [PATCH 23/32] perf, tools: Add browser support for transaction flags v2 Andi Kleen
2012-10-31 9:02 ` Andi Kleen [this message]
2012-10-31 0:34 ` [PATCH 24/32] perf, tools: Add arbitary aliases and support names with - Andi Kleen
2012-10-31 0:34 ` [PATCH 25/32] tools, perf: Add a precise event qualifier Andi Kleen
2012-10-31 0:34 ` [PATCH 26/32] perf, x86: improve sysfs event mapping with event string Andi Kleen
2012-10-31 0:34 ` [PATCH 27/32] perf, x86: Support CPU specific sysfs events Andi Kleen
2012-11-07 14:41 ` Stephane Eranian
2012-10-31 0:34 ` [PATCH 28/32] perf, x86: Add Haswell TSX event aliases v2 Andi Kleen
2012-10-31 0:34 ` [PATCH 29/32] perf, tools: Add perf stat --transaction v2 Andi Kleen
2012-10-31 0:34 ` [PATCH 30/32] perf, x86: Add a Haswell precise instructions event v2 Andi Kleen
2012-10-31 0:34 ` [PATCH 31/32] perf, tools: Default to cpu// for events v3 Andi Kleen
2012-10-31 0:34 ` [PATCH 32/32] perf, tools: List kernel supplied event aliases in perf list v2 Andi Kleen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121031090241.GA28297@tassilo.jf.intel.com \
--to=ak@linux.intel.com \
--cc=acme@redhat.com \
--cc=andi@firstfloor.org \
--cc=eranian@google.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome