public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Jiri Olsa <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: eranian@google.com, linux-kernel@vger.kernel.org,
	ak@linux.intel.com, mingo@kernel.org, namhyung@kernel.org,
	hpa@zytor.com, adrian.hunter@intel.com, jolsa@kernel.org,
	a.p.zijlstra@chello.nl, dsahern@gmail.com, tglx@linutronix.de,
	acme@redhat.com
Subject: [tip:perf/urgent] perf thread_map: Introduce thread_map__reset function
Date: Mon, 29 Jun 2015 21:52:30 -0700	[thread overview]
Message-ID: <tip-62eea464380633b88902da35bf9cbd8515289703@git.kernel.org> (raw)
In-Reply-To: <1435310967-14570-2-git-send-email-jolsa@kernel.org>

Commit-ID:  62eea464380633b88902da35bf9cbd8515289703
Gitweb:     http://git.kernel.org/tip/62eea464380633b88902da35bf9cbd8515289703
Author:     Jiri Olsa <jolsa@kernel.org>
AuthorDate: Fri, 26 Jun 2015 11:29:06 +0200
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Fri, 26 Jun 2015 11:03:41 -0300

perf thread_map: Introduce thread_map__reset function

We need to reset newly allocated 'struct thread_map_data' entries,
because we will introduce new comm memeber, which will get set later or
not at all.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1435310967-14570-2-git-send-email-jolsa@kernel.org
[ Use sizeof(map->map[0]) to be independent of the array entry type ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/thread_map.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/tools/perf/util/thread_map.c b/tools/perf/util/thread_map.c
index 368cc58..ed76c17 100644
--- a/tools/perf/util/thread_map.c
+++ b/tools/perf/util/thread_map.c
@@ -21,11 +21,26 @@ static int filter(const struct dirent *dir)
 		return 1;
 }
 
+static void thread_map__reset(struct thread_map *map, int start, int nr)
+{
+	size_t size = (nr - start) * sizeof(map->map[0]);
+
+	memset(&map->map[start], 0, size);
+}
+
 static struct thread_map *thread_map__realloc(struct thread_map *map, int nr)
 {
 	size_t size = sizeof(*map) + sizeof(map->map[0]) * nr;
+	int start = map ? map->nr : 0;
 
-	return realloc(map, size);
+	map = realloc(map, size);
+	/*
+	 * We only realloc to add more items, let's reset new items.
+	 */
+	if (map)
+		thread_map__reset(map, start, nr);
+
+	return map;
 }
 
 #define thread_map__alloc(__nr) thread_map__realloc(NULL, __nr)

  parent reply	other threads:[~2015-06-30  4:52 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-26  9:29 [PATCHv5 00/22] perf stat: Introduce --per-thread option Jiri Olsa
2015-06-26  9:29 ` [PATCH 01/22] perf thread_map: Introduce thread_map__reset function Jiri Olsa
2015-06-26 14:06   ` Arnaldo Carvalho de Melo
2015-06-30  4:52   ` tip-bot for Jiri Olsa [this message]
2015-06-26  9:29 ` [PATCH 02/22] perf tools: Add comm string into struct thread_map Jiri Olsa
2015-06-30  4:52   ` [tip:perf/urgent] perf thrad_map: Add comm string into array tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 03/22] perf tests: Add thread_map object tests Jiri Olsa
2015-06-30  4:53   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 04/22] perf stat: Introduce perf_counts function Jiri Olsa
2015-06-30  4:53   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 05/22] perf stat: Use xyarray for cpu evsel counts Jiri Olsa
2015-06-30  4:53   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 06/22] perf stat: Make stats work over the thread dimension Jiri Olsa
2015-06-30  4:54   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 07/22] perf stat: Rename struct perf_counts::cpu member to values Jiri Olsa
2015-06-30  4:54   ` [tip:perf/urgent] perf stat: Rename struct perf_counts:: cpu " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 08/22] perf stat: Introduce perf_evlist__reset_stats Jiri Olsa
2015-06-30  4:54   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 09/22] perf stat: Move perf_evsel__(alloc|free|reset)_stat_priv into stat object Jiri Olsa
2015-06-30  4:54   ` [tip:perf/urgent] perf stat: Move perf_evsel__(alloc|free|reset) _stat_priv " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 10/22] perf stat: Move perf_evsel__(alloc|free)_prev_raw_counts " Jiri Olsa
2015-06-30  4:55   ` [tip:perf/urgent] perf stat: Move perf_evsel__(alloc|free) _prev_raw_counts " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 11/22] perf stat: Move perf_evlist__(alloc|free|reset)_stats " Jiri Olsa
2015-06-30  4:55   ` [tip:perf/urgent] perf stat: Move perf_evlist__(alloc|free|reset) _stats " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 12/22] perf stat: Introduce perf_evsel__alloc_stats function Jiri Olsa
2015-06-30  4:55   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 13/22] perf stat: Introduce perf_evsel__read function Jiri Olsa
2015-06-30  4:56   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 14/22] perf stat: Introduce read_counters function Jiri Olsa
2015-06-30  4:56   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 15/22] perf stat: Separate counters reading and processing Jiri Olsa
2015-06-30  4:56   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 16/22] perf stat: Move zero_per_pkg into counter process code Jiri Olsa
2015-06-30  4:57   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 17/22] perf stat: Move perf_stat initialization " Jiri Olsa
2015-06-30  4:57   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 18/22] perf stat: Remove perf_evsel__read_cb function Jiri Olsa
2015-06-30  4:57   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 19/22] perf stat: Rename print_interval to process_interval Jiri Olsa
2015-06-30  4:57   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 20/22] perf stat: Using init_stats instead of memset Jiri Olsa
2015-06-30  4:58   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 21/22] perf stat: Introduce print_counters function Jiri Olsa
2015-06-30  4:58   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 22/22] perf stat: Introduce --per-thread option Jiri Olsa
2015-06-30  4:58   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2015-06-26 15:06 ` [PATCHv5 00/22] " Arnaldo Carvalho de Melo

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=tip-62eea464380633b88902da35bf9cbd8515289703@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@redhat.com \
    --cc=adrian.hunter@intel.com \
    --cc=ak@linux.intel.com \
    --cc=dsahern@gmail.com \
    --cc=eranian@google.com \
    --cc=hpa@zytor.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=tglx@linutronix.de \
    /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