diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2015-09-21 16:19:10 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2015-09-22 12:51:55 -0400 |
| commit | 68f3161e8d5d9db04538a6eb51c30dd912bbbe7a (patch) | |
| tree | 6974215b0ce2efde0f000b13237951fa74c87826 | |
| parent | 3d099b4fc751b3f62d77bcd902c1defac8c3889f (diff) | |
| download | trace-cmd-68f3161e8d5d9db04538a6eb51c30dd912bbbe7a.tar.gz | |
trace-cmd split: Remove malloc_or_die()
Replace malloc_or_die() with a more descriptive exit when failing an
allocation.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
| -rw-r--r-- | trace-split.c | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/trace-split.c b/trace-split.c index e48c7b11..87d43ada 100644 --- a/trace-split.c +++ b/trace-split.c @@ -244,8 +244,11 @@ static int parse_cpu(struct tracecmd_input *handle, if (cpu_data[cpu].page) write_page(pevent, &cpu_data[cpu], long_size); - else - cpu_data[cpu].page = malloc_or_die(page_size); + else { + cpu_data[cpu].page = malloc(page_size); + if (!cpu_data[cpu].page) + die("Failed to allocate page"); + } memset(cpu_data[cpu].page, 0, page_size); ptr = cpu_data[cpu].page; @@ -361,10 +364,14 @@ static double parse_file(struct tracecmd_input *handle, ohandle = tracecmd_copy(handle, output_file); cpus = tracecmd_cpus(handle); - cpu_data = malloc_or_die(sizeof(*cpu_data) * cpus); + cpu_data = malloc(sizeof(*cpu_data) * cpus); + if (!cpu_data) + die("Failed to allocate cpu_data for %d cpus", cpus); for (cpu = 0; cpu < cpus; cpu++) { - file = malloc_or_die(strlen(output_file) + 50); + file = malloc(strlen(output_file) + 50); + if (!file) + die("Failed to allocate file for %s %s %d", dir, base, cpu); sprintf(file, "%s/.tmp.%s.%d", dir, base, cpu); fd = open(file, O_WRONLY | O_CREAT | O_TRUNC | O_LARGEFILE, 0644); cpu_data[cpu].cpu = cpu; @@ -386,7 +393,9 @@ static double parse_file(struct tracecmd_input *handle, parse_cpu(handle, cpu_data, start, end, count, percpu, -1, type); - cpu_list = malloc_or_die(sizeof(*cpu_list) * cpus); + cpu_list = malloc(sizeof(*cpu_list) * cpus); + if (!cpu_list) + die("Failed to allocate cpu_list for %d cpus", cpus); for (cpu = 0; cpu < cpus; cpu ++) cpu_list[cpu] = cpu_data[cpu].file; @@ -530,7 +539,9 @@ void trace_split (int argc, char **argv) } current = start_ns; - output_file = malloc_or_die(strlen(output) + 50); + output_file = malloc(strlen(output) + 50); + if (!output_file) + die("Failed to allocate for %s", output); c = 1; do { |