Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1297721

[PATCH v4.2 02/13] perf hist: Save raw_data/size for tracepoint events

From Namhyung Kim <namhyung@kernel.org>
Newsgroups linux.kernel
Subject [PATCH v4.2 02/13] perf hist: Save raw_data/size for tracepoint events
Date 2015-12-24 03:20 +0100
Message-ID <qJ3Fv-Na-3@gated-at.bofh.it> (permalink)
References <qJ32O-kI-21@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


The raw_data and raw_size fields are to provide tracepoint specific
information.  They will be used by dynamic sort keys later.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
Make a copy using memdup()

 tools/perf/util/hist.c | 24 ++++++++++++++++++++++++
 tools/perf/util/sort.h |  2 ++
 2 files changed, 26 insertions(+)

diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index 039bb91d0a92..2dcf38a78f08 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -369,6 +369,25 @@ static struct hist_entry *hist_entry__new(struct hist_entry *template,
 		if (symbol_conf.use_callchain)
 			callchain_init(he->callchain);
 
+		if (he->raw_data) {
+			he->raw_data = memdup(he->raw_data, he->raw_size);
+
+			if (he->raw_data == NULL) {
+				map__put(he->ms.map);
+				if (he->branch_info) {
+					map__put(he->branch_info->from.map);
+					map__put(he->branch_info->to.map);
+					free(he->branch_info);
+				}
+				if (he->mem_info) {
+					map__put(he->mem_info->iaddr.map);
+					map__put(he->mem_info->daddr.map);
+				}
+				free(he->stat_acc);
+				free(he);
+				return NULL;
+			}
+		}
 		INIT_LIST_HEAD(&he->pairs.node);
 		thread__get(he->thread);
 	}
@@ -487,6 +506,8 @@ struct hist_entry *__hists__add_entry(struct hists *hists,
 		.branch_info = bi,
 		.mem_info = mi,
 		.transaction = sample->transaction,
+		.raw_data = sample->raw_data,
+		.raw_size = sample->raw_size,
 	};
 
 	return hists__findnew_entry(hists, &entry, al, sample_self);
@@ -801,6 +822,8 @@ iter_add_next_cumulative_entry(struct hist_entry_iter *iter,
 			.sym = al->sym,
 		},
 		.parent = iter->parent,
+		.raw_data = sample->raw_data,
+		.raw_size = sample->raw_size,
 	};
 	int i;
 	struct callchain_cursor cursor;
@@ -974,6 +997,7 @@ void hist_entry__delete(struct hist_entry *he)
 	if (he->srcfile && he->srcfile[0])
 		free(he->srcfile);
 	free_callchain(he->callchain);
+	free(he->raw_data);
 	free(he);
 }
 
diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h
index 86f05e7a5566..d29898708dbd 100644
--- a/tools/perf/util/sort.h
+++ b/tools/perf/util/sort.h
@@ -122,6 +122,8 @@ struct hist_entry {
 	struct branch_info	*branch_info;
 	struct hists		*hists;
 	struct mem_info		*mem_info;
+	void			*raw_data;
+	u32			raw_size;
 	struct callchain_root	callchain[0]; /* must be last member */
 };
 
-- 
2.6.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCHSET 00/10] perf tools: Support dynamic sort keys for tracepoints (v4) Namhyung Kim <namhyung@kernel.org> - 2015-12-22 18:10 +0100
  [PATCH 13/13] perf tools: Make 'trace' or 'trace_fields' sort key default for tracepoint events Namhyung Kim <namhyung@kernel.org> - 2015-12-22 18:10 +0100
  [PATCH 09/13] perf tools: Support shortcuts for events in dynamic sort keys Namhyung Kim <namhyung@kernel.org> - 2015-12-22 18:10 +0100
  [PATCH 04/13] perf tools: Pass evlist to setup_sorting() Namhyung Kim <namhyung@kernel.org> - 2015-12-22 18:10 +0100
  [PATCH 10/13] perf tools: Support '<event>.*' dynamic sort key Namhyung Kim <namhyung@kernel.org> - 2015-12-22 18:10 +0100
  [PATCH 01/13] perf hist: Pass struct sample to __hists__add_entry() Namhyung Kim <namhyung@kernel.org> - 2015-12-22 18:10 +0100
  [PATCH 11/13] perf tools: Skip dynamic fields not defined for current event Namhyung Kim <namhyung@kernel.org> - 2015-12-22 18:10 +0100
  [PATCH 07/13] perf tools: Add 'trace' sort key Namhyung Kim <namhyung@kernel.org> - 2015-12-22 18:10 +0100
  [PATCH 12/13] perf tools: Add 'trace_fields' dynamic sort key Namhyung Kim <namhyung@kernel.org> - 2015-12-22 18:10 +0100
  [PATCH 06/13] perf tools: Try to show pretty printed output for dynamic sort keys Namhyung Kim <namhyung@kernel.org> - 2015-12-22 18:10 +0100
  [PATCH 08/13] perf tools: Add --raw-trace option Namhyung Kim <namhyung@kernel.org> - 2015-12-22 18:20 +0100
  [PATCH 02/13] perf hist: Save raw_data/size for tracepoint events Namhyung Kim <namhyung@kernel.org> - 2015-12-22 18:20 +0100
    Re: [PATCH 02/13] perf hist: Save raw_data/size for tracepoint events Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-12-23 22:50 +0100
      Re: [PATCH 02/13] perf hist: Save raw_data/size for tracepoint events Namhyung Kim <namhyung@kernel.org> - 2015-12-24 01:50 +0100
        Re: [PATCH 02/13] perf hist: Save raw_data/size for tracepoint events Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-12-24 02:20 +0100
      [PATCH v4.1 02/13] perf hist: Save raw_data/size for tracepoint events Namhyung Kim <namhyung@kernel.org> - 2015-12-24 02:10 +0100
        Re: [PATCH v4.1 02/13] perf hist: Save raw_data/size for tracepoint  events Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-12-24 02:40 +0100
          [PATCH v4.2 02/13] perf hist: Save raw_data/size for tracepoint events Namhyung Kim <namhyung@kernel.org> - 2015-12-24 03:20 +0100
  [PATCH 05/13] perf tools: Add dynamic sort key for tracepoint events Namhyung Kim <namhyung@kernel.org> - 2015-12-22 18:20 +0100
  Re: [PATCHSET 00/10] perf tools: Support dynamic sort keys for  tracepoints (v4) Jiri Olsa <jolsa@redhat.com> - 2015-12-23 09:50 +0100
    Re: [PATCHSET 00/10] perf tools: Support dynamic sort keys for  tracepoints (v4) Namhyung Kim <namhyung@kernel.org> - 2015-12-23 14:20 +0100

csiph-web