From: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com>
To: rostedt@goodmis.org
Cc: linux-trace-devel@vger.kernel.org
Subject: [PATCH v17 08/18] trace-cmd: Implement new API tracecmd_add_option_v()
Date: Tue, 3 Dec 2019 12:35:12 +0200 [thread overview]
Message-ID: <20191203103522.482684-9-tz.stoyanov@gmail.com> (raw)
In-Reply-To: <20191203103522.482684-1-tz.stoyanov@gmail.com>
From: Tzvetomir Stoyanov <tstoyanov@vmware.com>
A new tracecmd API tracecmd_add_option_v() is introduced.
It adds new option in trace.dat, similar to tracecmd_add_option(),
but the option's data is passed as list of buffers. The standard
struct iovec is used as input parameter, containing the option's
data buffers.
Signed-off-by: Tzvetomir Stoyanov <tstoyanov@vmware.com>
---
include/trace-cmd/trace-cmd.h | 5 ++
include/traceevent/event-parse.h | 1 +
lib/trace-cmd/trace-output.c | 116 +++++++++++++++++++++++++++----
3 files changed, 108 insertions(+), 14 deletions(-)
diff --git a/include/trace-cmd/trace-cmd.h b/include/trace-cmd/trace-cmd.h
index 831bb1a..47fa463 100644
--- a/include/trace-cmd/trace-cmd.h
+++ b/include/trace-cmd/trace-cmd.h
@@ -261,11 +261,16 @@ struct tracecmd_output *tracecmd_create_init_file_override(const char *output_fi
struct tracecmd_option *tracecmd_add_option(struct tracecmd_output *handle,
unsigned short id, int size,
const void *data);
+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_write_cpus(struct tracecmd_output *handle, int cpus);
int tracecmd_write_options(struct tracecmd_output *handle);
+int tracecmd_append_options(struct tracecmd_output *handle);
int tracecmd_update_option(struct tracecmd_output *handle,
struct tracecmd_option *option, int size,
const void *data);
diff --git a/include/traceevent/event-parse.h b/include/traceevent/event-parse.h
index a77af4c..30e06a7 100644
--- a/include/traceevent/event-parse.h
+++ b/include/traceevent/event-parse.h
@@ -11,6 +11,7 @@
#include <stdio.h>
#include <regex.h>
#include <string.h>
+#include <sys/uio.h>
#include "traceevent/trace-seq.h"
diff --git a/lib/trace-cmd/trace-output.c b/lib/trace-cmd/trace-output.c
index be4d3f5..db65ee4 100644
--- a/lib/trace-cmd/trace-output.c
+++ b/lib/trace-cmd/trace-output.c
@@ -950,21 +950,27 @@ static struct tracecmd_output *create_file(const char *output_file,
}
/**
- * tracecmd_add_option - add options to the file
+ * tracecmd_add_option_v - add options to the file
* @handle: the output file handle name
* @id: the id of the option
* @size: the size of the option data
* @data: the data to write to the file.
+ * @vector: array of vectors, pointing to the data to write in the file
+ * @count: number of items in the vector array
+ *
*
* Returns handle to update option if needed.
* Just the content can be updated, with smaller or equal to
* content than the specified size.
*/
struct tracecmd_option *
-tracecmd_add_option(struct tracecmd_output *handle,
- unsigned short id, int size, const void *data)
+tracecmd_add_option_v(struct tracecmd_output *handle,
+ unsigned short id, const struct iovec *vector, int count)
+
{
struct tracecmd_option *option;
+ char *data = NULL;
+ int i, size = 0;
/*
* We can only add options before they were written.
@@ -973,32 +979,63 @@ tracecmd_add_option(struct tracecmd_output *handle,
if (handle->options_written)
return NULL;
- handle->nr_options++;
+ for (i = 0; i < count; i++)
+ size += vector[i].iov_len;
+ /* Some IDs (like TRACECMD_OPTION_TRACECLOCK) pass vector with 0 / NULL data */
+ if (size) {
+ data = malloc(size);
+ if (!data) {
+ warning("Insufficient memory");
+ return NULL;
+ }
+ }
option = malloc(sizeof(*option));
if (!option) {
warning("Could not allocate space for option");
+ free(data);
return NULL;
}
- option->id = id;
- option->size = size;
- option->data = malloc(size);
- if (!option->data) {
- warning("Insufficient memory");
- free(option);
- return NULL;
+ handle->nr_options++;
+ option->data = data;
+ for (i = 0; i < count; i++) {
+ if (vector[i].iov_base && vector[i].iov_len) {
+ memcpy(data, vector[i].iov_base, vector[i].iov_len);
+ data += vector[i].iov_len;
+ }
}
- /* Some IDs (like TRACECMD_OPTION_TRACECLOCK) pass 0 / NULL data */
- if (size)
- memcpy(option->data, data, size);
+ option->size = size;
+ option->id = id;
list_add_tail(&option->list, &handle->options);
return option;
}
+/**
+ * tracecmd_add_option - add options to the file
+ * @handle: the output file handle name
+ * @id: the id of the option
+ * @size: the size of the option data
+ * @data: the data to write to the file.
+ *
+ * Returns handle to update option if needed.
+ * Just the content can be updated, with smaller or equal to
+ * content than the specified size.
+ */
+struct tracecmd_option *
+tracecmd_add_option(struct tracecmd_output *handle,
+ unsigned short id, int size, const void *data)
+{
+ struct iovec vect;
+
+ vect.iov_base = (void *) data;
+ vect.iov_len = size;
+ return tracecmd_add_option_v(handle, id, &vect, 1);
+}
+
int tracecmd_write_cpus(struct tracecmd_output *handle, int cpus)
{
cpus = convert_endian_4(handle, cpus);
@@ -1046,6 +1083,57 @@ int tracecmd_write_options(struct tracecmd_output *handle)
return 0;
}
+int tracecmd_append_options(struct tracecmd_output *handle)
+{
+ struct tracecmd_option *options;
+ unsigned short option;
+ unsigned short endian2;
+ unsigned int endian4;
+ off_t offset;
+ int r;
+
+ /* If already written, ignore */
+ if (handle->options_written)
+ return 0;
+
+ if (lseek64(handle->fd, 0, SEEK_END) == (off_t)-1)
+ return -1;
+ offset = lseek64(handle->fd, -2, SEEK_CUR);
+ if (offset == (off_t)-1)
+ return -1;
+
+ r = pread(handle->fd, &option, 2, offset);
+ if (r != 2 || option != TRACECMD_OPTION_DONE)
+ return -1;
+
+ list_for_each_entry(options, &handle->options, list) {
+ endian2 = convert_endian_2(handle, options->id);
+ if (do_write_check(handle, &endian2, 2))
+ return -1;
+
+ endian4 = convert_endian_4(handle, options->size);
+ if (do_write_check(handle, &endian4, 4))
+ return -1;
+
+ /* Save the data location in case it needs to be updated */
+ options->offset = lseek64(handle->fd, 0, SEEK_CUR);
+
+ if (do_write_check(handle, options->data,
+ options->size))
+ return -1;
+ }
+
+ option = TRACECMD_OPTION_DONE;
+
+ if (do_write_check(handle, &option, 2))
+ return -1;
+
+ handle->options_written = 1;
+ handle->options_written = 1;
+
+ return 0;
+}
+
int tracecmd_update_option(struct tracecmd_output *handle,
struct tracecmd_option *option, int size,
const void *data)
--
2.23.0
next prev parent reply other threads:[~2019-12-03 10:35 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-03 10:35 [PATCH v17 00/18]Timestamp synchronization of host - guest tracing session Tzvetomir Stoyanov (VMware)
2019-12-03 10:35 ` [PATCH v17 01/18] trace-cmd: Implement new lib API: tracecmd_local_events_system() Tzvetomir Stoyanov (VMware)
2019-12-03 10:35 ` [PATCH v17 02/18] trace-cmd: Add support for negative time offsets in trace.dat file Tzvetomir Stoyanov (VMware)
2019-12-03 10:35 ` [PATCH v17 03/18] trace-cmd: Add implementations of htonll() and ntohll() Tzvetomir Stoyanov (VMware)
2019-12-20 13:50 ` Steven Rostedt
2020-01-06 14:30 ` Tzvetomir Stoyanov
2019-12-03 10:35 ` [PATCH v17 04/18] trace-cmd: Add new library APIs for ftrace instances Tzvetomir Stoyanov (VMware)
2019-12-04 16:17 ` Steven Rostedt
2019-12-05 14:40 ` Tzvetomir Stoyanov
2019-12-03 10:35 ` [PATCH v17 05/18] trace-cmd: Add new library API for local CPU count Tzvetomir Stoyanov (VMware)
2019-12-04 20:09 ` Steven Rostedt
2019-12-03 10:35 ` [PATCH v17 06/18] trace-cmd: Add new library API for reading ftrace buffers Tzvetomir Stoyanov (VMware)
2019-12-04 21:10 ` Steven Rostedt
2019-12-03 10:35 ` [PATCH v17 07/18] trace-cmd: Find and store pids of tasks, which run virtual CPUs of given VM Tzvetomir Stoyanov (VMware)
2019-12-04 21:35 ` Steven Rostedt
2019-12-03 10:35 ` Tzvetomir Stoyanov (VMware) [this message]
2019-12-04 21:47 ` [PATCH v17 08/18] trace-cmd: Implement new API tracecmd_add_option_v() Steven Rostedt
2019-12-03 10:35 ` [PATCH v17 09/18] trace-cmd: Add new API to generate a unique ID of the tracing session Tzvetomir Stoyanov (VMware)
2019-12-03 10:35 ` [PATCH v17 10/18] trace-cmd: Store the session tracing ID in the trace.dat file Tzvetomir Stoyanov (VMware)
2019-12-03 10:35 ` [PATCH v17 11/18] trace-cmd: Exchange tracing IDs between host and guest Tzvetomir Stoyanov (VMware)
2019-12-04 22:03 ` Steven Rostedt
2019-12-03 10:35 ` [PATCH v17 12/18] trace-cmd: Implement new option in trace.dat file: TRACECMD_OPTION_TIME_SHIFT Tzvetomir Stoyanov (VMware)
2019-12-05 0:46 ` Steven Rostedt
2019-12-05 15:09 ` Tzvetomir Stoyanov
2019-12-03 10:35 ` [PATCH v17 13/18] trace-cmd: Add guest information in host's trace.dat file Tzvetomir Stoyanov (VMware)
2019-12-05 0:59 ` Steven Rostedt
2019-12-03 10:35 ` [PATCH v17 14/18] trace-cmd: Add host trace clock as guest trace argument Tzvetomir Stoyanov (VMware)
2019-12-09 19:31 ` Steven Rostedt
2019-12-10 8:49 ` Tzvetomir Stoyanov
2019-12-10 15:48 ` Steven Rostedt
2019-12-11 8:21 ` Tzvetomir Stoyanov
2019-12-11 15:01 ` Steven Rostedt
2019-12-03 10:35 ` [PATCH v17 15/18] trace-cmd: Refactor few trace-cmd internal functions Tzvetomir Stoyanov (VMware)
2019-12-09 19:32 ` Steven Rostedt
2019-12-03 10:35 ` [PATCH v17 16/18] trace-cmd: Basic infrastructure for host - guest timestamp synchronization Tzvetomir Stoyanov (VMware)
2019-12-10 17:04 ` Steven Rostedt
2019-12-10 18:39 ` Steven Rostedt
2019-12-12 12:34 ` Tzvetomir Stoyanov
2019-12-12 14:54 ` Steven Rostedt
2019-12-12 14:00 ` Tzvetomir Stoyanov
2019-12-03 10:35 ` [PATCH v17 17/18] trace-cmd: [POC] PTP-like algorithm " Tzvetomir Stoyanov (VMware)
2019-12-03 10:35 ` [PATCH v17 18/18] trace-cmd: Debug scripts for " 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=20191203103522.482684-9-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).