diff options
author | Steven Rostedt (Google) <rostedt@goodmis.org> | 2022-03-23 20:08:04 -0400 |
---|---|---|
committer | Steven Rostedt (Google) <rostedt@goodmis.org> | 2022-03-24 17:52:12 -0400 |
commit | dcdf343662ebfdb78b48b90ea2aa130055220baa (patch) | |
tree | 4bf93de2f372bfe7f7edba43b1a399a092500e77 | |
parent | 1b61eb2cf08223a751d7c247e8f759016256f848 (diff) | |
download | trace-cmd-dcdf343662ebfdb78b48b90ea2aa130055220baa.tar.gz |
trace-cmd library: Use cpu_data variable to shorten commands
Instead of using handle->cpu_data[cpu] for all the references in
tracecmd_close(), just assign it to a variable cpu_data and use that. It
makes the code much more readable.
Link: https://lore.kernel.org/linux-trace-devel/20220324000805.1666464-2-rostedt@goodmis.org
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
-rw-r--r-- | lib/trace-cmd/trace-input.c | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c index aa40d245..f74c466a 100644 --- a/lib/trace-cmd/trace-input.c +++ b/lib/trace-cmd/trace-input.c @@ -4430,6 +4430,7 @@ void tracecmd_close(struct tracecmd_input *handle) { struct zchunk_cache *cache; struct file_section *del_sec; + struct cpu_data *cpu_data; int cpu; int i; @@ -4449,30 +4450,31 @@ void tracecmd_close(struct tracecmd_input *handle) free_next(handle, cpu); free_page(handle, cpu); if (handle->cpu_data) { - if (handle->cpu_data[cpu].kbuf) { - kbuffer_free(handle->cpu_data[cpu].kbuf); - if (handle->cpu_data[cpu].page_map) - free_page_map(handle->cpu_data[cpu].page_map); + cpu_data = &handle->cpu_data[cpu]; + if (cpu_data->kbuf) { + kbuffer_free(cpu_data->kbuf); + if (cpu_data->page_map) + free_page_map(cpu_data->page_map); - if (handle->cpu_data[cpu].page_cnt) + if (cpu_data->page_cnt) tracecmd_warning("%d pages still allocated on cpu %d%s", - handle->cpu_data[cpu].page_cnt, cpu, - show_records(handle->cpu_data[cpu].pages, - handle->cpu_data[cpu].nr_pages)); - free(handle->cpu_data[cpu].pages); + cpu_data->page_cnt, cpu, + show_records(cpu_data->pages, + cpu_data->nr_pages)); + free(cpu_data->pages); } - if (handle->cpu_data[cpu].compress.fd >= 0) { - close(handle->cpu_data[cpu].compress.fd); - unlink(handle->cpu_data[cpu].compress.file); + if (cpu_data->compress.fd >= 0) { + close(cpu_data->compress.fd); + unlink(cpu_data->compress.file); } - while (!list_empty(&handle->cpu_data[cpu].compress.cache)) { - cache = container_of(handle->cpu_data[cpu].compress.cache.next, + while (!list_empty(&cpu_data->compress.cache)) { + cache = container_of(cpu_data->compress.cache.next, struct zchunk_cache, list); list_del(&cache->list); free(cache->map); free(cache); } - free(handle->cpu_data[cpu].compress.chunks); + free(cpu_data->compress.chunks); } } |