Skip to contentSkip to conversation

perf tools: Don't die on a print function

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Apr 5, 2017 perf events

lore
Share & tools
lore

tip-bot for Arnaldo Carvalho de Melo

author merge bot
#0 lore raw
Commit-ID:  9c0899f15766158df8b3bd152f5da0b6c1bd2806
Gitweb:     http://git.kernel.org/tip/9c0899f15766158df8b3bd152f5da0b6c1bd2806
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Tue, 4 Apr 2017 12:11:07 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Tue, 4 Apr 2017 12:11:07 -0300

perf tools: Don't die on a print function

Trying to remove die() calls from library functions, postponing exiting to the tool main code.

Link http://lkml.kernel.org/n/[email protected] open here
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
---
 tools/perf/util/values.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
tools/perf/util/values.c +7 -2
index 2a8efa7..5de2e15 100644
@@ -1,4 +1,7 @@
+#include <inttypes.h>
+#include <stdio.h>
 #include <stdlib.h>
+#include <errno.h>
 
 #include "util.h"
 #include "values.h"

@@ -196,8 +199,10 @@ static void perf_read_values__display_pretty(FILE *fp,
 	int *counterwidth;
 
 	counterwidth = malloc(values->counters * sizeof(*counterwidth));
-	if (!counterwidth)
-		die("failed to allocate counterwidth array");
+	if (!counterwidth) {
+		fprintf(fp, "INTERNAL ERROR: Failed to allocate counterwidth array\n");
+		return;
+	}
 	tidwidth = 3;
 	pidwidth = 3;
 	for (j = 0; j < values->counters; j++)