From: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com>
To: rostedt@goodmis.org
Cc: linux-trace-devel@vger.kernel.org
Subject: [PATCH v2 2/4] trace-cmd: Use the new trace buffers API
Date: Mon, 11 Oct 2021 07:26:34 +0300 [thread overview]
Message-ID: <20211011042636.1608374-3-tz.stoyanov@gmail.com> (raw)
In-Reply-To: <20211011042636.1608374-1-tz.stoyanov@gmail.com>
When recording trace buffers, use the newly introduced library API for
describing the buffers.
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
---
.../include/private/trace-cmd-private.h | 2 --
lib/trace-cmd/trace-output.c | 7 +++----
tracecmd/trace-record.c | 16 +++++-----------
3 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/lib/trace-cmd/include/private/trace-cmd-private.h b/lib/trace-cmd/include/private/trace-cmd-private.h
index 75680d73..ed41f937 100644
--- a/lib/trace-cmd/include/private/trace-cmd-private.h
+++ b/lib/trace-cmd/include/private/trace-cmd-private.h
@@ -290,8 +290,6 @@ struct tracecmd_option *
tracecmd_add_option_v(struct tracecmd_output *handle,
unsigned short id, const struct iovec *vector, int count);
-struct tracecmd_option *tracecmd_add_buffer_option(struct tracecmd_output *handle,
- const char *name, int cpus);
int tracecmd_add_buffer_info(struct tracecmd_output *handle, const char *name, int cpus);
int tracecmd_write_buffer_info(struct tracecmd_output *handle);
diff --git a/lib/trace-cmd/trace-output.c b/lib/trace-cmd/trace-output.c
index f0f6aeed..1f144d28 100644
--- a/lib/trace-cmd/trace-output.c
+++ b/lib/trace-cmd/trace-output.c
@@ -1334,9 +1334,8 @@ int tracecmd_append_options(struct tracecmd_output *handle)
return 0;
}
-struct tracecmd_option *
-tracecmd_add_buffer_option(struct tracecmd_output *handle, const char *name,
- int cpus)
+static struct tracecmd_option *
+add_buffer_option(struct tracecmd_output *handle, const char *name, int cpus)
{
struct tracecmd_option *option;
char *buf;
@@ -1387,7 +1386,7 @@ int tracecmd_write_buffer_info(struct tracecmd_output *handle)
struct tracecmd_buffer *buf;
list_for_each_entry(buf, &handle->buffers, list) {
- option = tracecmd_add_buffer_option(handle, buf->name, buf->cpus);
+ option = add_buffer_option(handle, buf->name, buf->cpus);
if (!option)
return -1;
buf->option = option;
diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
index 15e07cf0..c96dcda0 100644
--- a/tracecmd/trace-record.c
+++ b/tracecmd/trace-record.c
@@ -4169,7 +4169,6 @@ static void touch_file(const char *file)
}
static void append_buffer(struct tracecmd_output *handle,
- struct tracecmd_option *buffer_option,
struct buffer_instance *instance,
char **temp_files)
{
@@ -4197,7 +4196,7 @@ static void append_buffer(struct tracecmd_output *handle,
touch_file(temp_files[i]);
}
- tracecmd_append_buffer_cpu_data(handle, buffer_option,
+ tracecmd_append_buffer_cpu_data(handle, NULL,
cpu_count, temp_files);
for (i = 0; i < instance->cpu_count; i++) {
@@ -4482,7 +4481,6 @@ error:
static void record_data(struct common_record_context *ctx)
{
- struct tracecmd_option **buffer_options;
struct tracecmd_output *handle;
struct buffer_instance *instance;
bool local = false;
@@ -4551,9 +4549,6 @@ static void record_data(struct common_record_context *ctx)
}
if (buffers) {
- buffer_options = malloc(sizeof(*buffer_options) * buffers);
- if (!buffer_options)
- die("Failed to allocate buffer options");
i = 0;
for_each_instance(instance) {
int cpus = instance->cpu_count != local_cpu_count ?
@@ -4561,10 +4556,9 @@ static void record_data(struct common_record_context *ctx)
if (instance->msg_handle)
continue;
-
- buffer_options[i++] = tracecmd_add_buffer_option(handle,
- tracefs_instance_get_name(instance->tracefs),
- cpus);
+ tracecmd_add_buffer_info(handle,
+ tracefs_instance_get_name(instance->tracefs),
+ cpus);
add_buffer_stat(handle, instance);
}
}
@@ -4599,7 +4593,7 @@ static void record_data(struct common_record_context *ctx)
if (instance->msg_handle)
continue;
print_stat(instance);
- append_buffer(handle, buffer_options[i++], instance, temp_files);
+ append_buffer(handle, instance, temp_files);
}
}
--
2.31.1
next prev parent reply other threads:[~2021-10-11 4:26 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-11 4:26 [PATCH v2 0/4] Refactor the logic for writing trace data in the file Tzvetomir Stoyanov (VMware)
2021-10-11 4:26 ` [PATCH v2 1/4] trace-cmd library: Add internal database for trace buffers Tzvetomir Stoyanov (VMware)
2021-10-11 4:26 ` Tzvetomir Stoyanov (VMware) [this message]
2021-10-11 4:26 ` [PATCH v2 3/4] trace-cmd library: Helper logic to update the trace buffer offset Tzvetomir Stoyanov (VMware)
2021-10-11 4:26 ` [PATCH v2 4/4] trace-cmd library: Refactor the logic for writing trace data in the file Tzvetomir Stoyanov (VMware)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211011042636.1608374-3-tz.stoyanov@gmail.com \
--to=tz.stoyanov@gmail.com \
--cc=linux-trace-devel@vger.kernel.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).