Skip to contentSkip to conversation

perf tools: Stop copying kallsyms into the perf.data file header

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Jul 29, 2015 perf events

lore
Share & tools
lore
#0 lore raw
Commit-ID:  6e5259e9b5b711b325a8455feb3ed27cdd0af0da
Gitweb:     http://git.kernel.org/tip/6e5259e9b5b711b325a8455feb3ed27cdd0af0da
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Wed, 22 Jul 2015 17:02:18 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 23 Jul 2015 22:51:12 -0300

perf tools: Stop copying kallsyms into the perf.data file header

Since we now ask libtraceevent, the only user of this payload, to use perf's symbol resolution routines, there is no need to carry about ~4.5MB per perf.data when we can get it from one of the places the perf symbol resolution looks for that symtab (debuginfo, ~/.debug/, /proc/kallsyms, --symfs, etc), using the kernel and modules build-ids to make sure the right table is used.

---
 tools/perf/util/trace-event-info.c | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)
tools/perf/util/trace-event-info.c +8 -14
index eb72716..2224598 100644
@@ -341,20 +341,14 @@ out:
 
 static int record_proc_kallsyms(void)
 {
-	unsigned int size;
-	const char *path = "/proc/kallsyms";
-	struct stat st;
-	int ret, err = 0;
-
-	ret = stat(path, &st);
-	if (ret < 0) {
-		/* not found */
-		size = 0;
-		if (write(output_fd, &size, 4) != 4)
-			err = -EIO;
-		return err;
-	}
-	return record_file(path, 4);
+	unsigned long long size = 0;
+	/*
+	 * Just to keep older perf.data file parsers happy, record a zero
+	 * sized kallsyms file, i.e. do the same thing that was done when
+	 * /proc/kallsyms (or something specified via --kallsyms, in a
+	 * different path) couldn't be read.
+	 */
+	return write(output_fd, &size, 4) != 4 ? -EIO : 0;
 }
 
 static int record_ftrace_printk(void)