|
@@ -260,39 +260,53 @@ static int read_header_files(struct pevent *pevent)
|
|
|
|
|
|
static int read_ftrace_file(struct pevent *pevent, unsigned long long size)
|
|
|
{
|
|
|
+ int ret;
|
|
|
char *buf;
|
|
|
|
|
|
buf = malloc(size);
|
|
|
- if (buf == NULL)
|
|
|
+ if (buf == NULL) {
|
|
|
+ pr_debug("memory allocation failure\n");
|
|
|
return -1;
|
|
|
+ }
|
|
|
|
|
|
- if (do_read(buf, size) < 0) {
|
|
|
- free(buf);
|
|
|
- return -1;
|
|
|
+ ret = do_read(buf, size);
|
|
|
+ if (ret < 0) {
|
|
|
+ pr_debug("error reading ftrace file.\n");
|
|
|
+ goto out;
|
|
|
}
|
|
|
|
|
|
- parse_ftrace_file(pevent, buf, size);
|
|
|
+ ret = parse_ftrace_file(pevent, buf, size);
|
|
|
+ if (ret < 0)
|
|
|
+ pr_debug("error parsing ftrace file.\n");
|
|
|
+out:
|
|
|
free(buf);
|
|
|
- return 0;
|
|
|
+ return ret;
|
|
|
}
|
|
|
|
|
|
static int read_event_file(struct pevent *pevent, char *sys,
|
|
|
unsigned long long size)
|
|
|
{
|
|
|
+ int ret;
|
|
|
char *buf;
|
|
|
|
|
|
buf = malloc(size);
|
|
|
- if (buf == NULL)
|
|
|
+ if (buf == NULL) {
|
|
|
+ pr_debug("memory allocation failure\n");
|
|
|
return -1;
|
|
|
+ }
|
|
|
|
|
|
- if (do_read(buf, size) < 0) {
|
|
|
+ ret = do_read(buf, size);
|
|
|
+ if (ret < 0) {
|
|
|
free(buf);
|
|
|
- return -1;
|
|
|
+ goto out;
|
|
|
}
|
|
|
|
|
|
- parse_event_file(pevent, buf, size, sys);
|
|
|
+ ret = parse_event_file(pevent, buf, size, sys);
|
|
|
+ if (ret < 0)
|
|
|
+ pr_debug("error parsing event file.\n");
|
|
|
+out:
|
|
|
free(buf);
|
|
|
- return 0;
|
|
|
+ return ret;
|
|
|
}
|
|
|
|
|
|
static int read_ftrace_files(struct pevent *pevent)
|
|
@@ -345,6 +359,7 @@ static int read_saved_cmdline(struct pevent *pevent)
|
|
|
{
|
|
|
unsigned long long size;
|
|
|
char *buf;
|
|
|
+ int ret;
|
|
|
|
|
|
/* it can have 0 size */
|
|
|
size = read8(pevent);
|
|
@@ -352,18 +367,22 @@ static int read_saved_cmdline(struct pevent *pevent)
|
|
|
return 0;
|
|
|
|
|
|
buf = malloc(size + 1);
|
|
|
- if (buf == NULL)
|
|
|
+ if (buf == NULL) {
|
|
|
+ pr_debug("memory allocation failure\n");
|
|
|
return -1;
|
|
|
+ }
|
|
|
|
|
|
- if (do_read(buf, size) < 0) {
|
|
|
- free(buf);
|
|
|
- return -1;
|
|
|
+ ret = do_read(buf, size);
|
|
|
+ if (ret < 0) {
|
|
|
+ pr_debug("error reading saved cmdlines\n");
|
|
|
+ goto out;
|
|
|
}
|
|
|
|
|
|
parse_saved_cmdline(pevent, buf, size);
|
|
|
-
|
|
|
+ ret = 0;
|
|
|
+out:
|
|
|
free(buf);
|
|
|
- return 0;
|
|
|
+ return ret;
|
|
|
}
|
|
|
|
|
|
ssize_t trace_report(int fd, struct trace_event *tevent, bool __repipe)
|