Skip to contentSkip to conversation

perf tools: Save partial non-overlapping map

PATCH In review Frederic Weisbecker 1 participant 2 messages Aug 18, 2009 perf events

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 perf tools: Save partial non-overlapping map

The librarization of the thread helpers between annotate and report lost some perf report specifics.

thread__insert_map() had its most uptodate version in perf report which cared about partial map overlapping.
In case of overlap between two maps, perf annotate's version removes the whole old map without considering if it partially or absolutely overlaps the new map.

We exported the odd version, change it by using the perf report version.

Cc Peter Zijlstra <[email protected]>
Cc Arnaldo Carvalho de Melo <[email protected]>
Cc Mike Galbraith <[email protected]>
---
 tools/perf/util/thread.c |   25 ++++++++++++++++++++++---
 1 files changed, 22 insertions(+), 3 deletions(-)
tools/perf/util/thread.c +22 -3
index 00c14b9..f98032c 100644
@@ -4,6 +4,7 @@
 #include <string.h>
 #include "thread.h"
 #include "util.h"
+#include "debug.h"
 
 static struct thread *thread__new(pid_t pid)
 {
@@ -85,9 +86,27 @@ void thread__insert_map(struct thread *self, struct map *map)
 
 	list_for_each_entry_safe(pos, tmp, &self->maps, node) {
 		if (map__overlap(pos, map)) {
-			list_del_init(&pos->node);
-			/* XXX leaks dsos */
-			free(pos);
+			if (verbose >= 2) {
+				printf("overlapping maps:\n");
+				map__fprintf(map, stdout);
+				map__fprintf(pos, stdout);
+			}
+
+			if (map->start <= pos->start && map->end > pos->start)
+				pos->start = map->end;
+
+			if (map->end >= pos->end && map->start < pos->end)
+				pos->end = map->start;
+
+			if (verbose >= 2) {
+				printf("after collision:\n");
+				map__fprintf(pos, stdout);
+			}
+
+			if (pos->start >= pos->end) {
+				list_del_init(&pos->node);
+				free(pos);
+			}
 		}
 	}
 
Signature · 1 line
1.6.2.3
#1 lore raw
Commit-ID:  6e086437f35ad9fda448711732c4ce0f82aad569
Gitweb:     http://git.kernel.org/tip/6e086437f35ad9fda448711732c4ce0f82aad569
Author:     Frederic Weisbecker <[email protected]>
AuthorDate: Tue, 18 Aug 2009 17:04:03 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Tue, 18 Aug 2009 17:18:03 +0200

perf tools: Save partial non-overlapping map

The librarization of the thread helpers between annotate and report lost some perf report specifics.

thread__insert_map() had its most uptodate version in perf report which cared about partial map overlapping. In case of overlap between two maps, perf annotate's version removes the whole old map without considering if it partially or absolutely overlaps the new map.

We exported the odd version, change it by using the perf report version.

Cc Frederic Weisbecker <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Arnaldo Carvalho de Melo <[email protected]>
Cc Mike Galbraith <[email protected]>

LKML-Reference: <[email protected]>

---
 tools/perf/util/thread.c |   25 ++++++++++++++++++++++---
 1 files changed, 22 insertions(+), 3 deletions(-)
tools/perf/util/thread.c +22 -3
index 00c14b9..f98032c 100644
@@ -4,6 +4,7 @@
 #include <string.h>
 #include "thread.h"
 #include "util.h"
+#include "debug.h"
 
 static struct thread *thread__new(pid_t pid)
 {
@@ -85,9 +86,27 @@ void thread__insert_map(struct thread *self, struct map *map)
 
 	list_for_each_entry_safe(pos, tmp, &self->maps, node) {
 		if (map__overlap(pos, map)) {
-			list_del_init(&pos->node);
-			/* XXX leaks dsos */
-			free(pos);
+			if (verbose >= 2) {
+				printf("overlapping maps:\n");
+				map__fprintf(map, stdout);
+				map__fprintf(pos, stdout);
+			}
+
+			if (map->start <= pos->start && map->end > pos->start)
+				pos->start = map->end;
+
+			if (map->end >= pos->end && map->start < pos->end)
+				pos->end = map->start;
+
+			if (verbose >= 2) {
+				printf("after collision:\n");
+				map__fprintf(pos, stdout);
+			}
+
+			if (pos->start >= pos->end) {
+				list_del_init(&pos->node);
+				free(pos);
+			}
 		}
 	}