From: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com>
To: rostedt@goodmis.org
Cc: linux-trace-devel@vger.kernel.org
Subject: [PATCH v22 04/13] trace-cmd: Store the session tracing ID in the trace.dat file
Date: Wed, 4 Mar 2020 11:12:11 +0200 [thread overview]
Message-ID: <20200304091220.30936-5-tz.stoyanov@gmail.com> (raw)
In-Reply-To: <20200304091220.30936-1-tz.stoyanov@gmail.com>
The ID of the current tracing session is stored in the trace.dat file.
A new file option is introduced:
TRACECMD_OPTION_TRACEID
The data is stored in the file as unsigned long long integer
A new libtracecmd API is introduced, to get the ID when the trace.dat file is read:
unsigned long long tracecmd_get_traceid(struct tracecmd_input *handle);
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
---
include/trace-cmd/trace-cmd.h | 2 ++
lib/trace-cmd/trace-input.c | 16 ++++++++++++++++
tracecmd/trace-dump.c | 11 +++++++++++
tracecmd/trace-record.c | 9 +++++++++
4 files changed, 38 insertions(+)
diff --git a/include/trace-cmd/trace-cmd.h b/include/trace-cmd/trace-cmd.h
index 7519e82a..6075a37e 100644
--- a/include/trace-cmd/trace-cmd.h
+++ b/include/trace-cmd/trace-cmd.h
@@ -109,6 +109,7 @@ enum {
TRACECMD_OPTION_CPUCOUNT,
TRACECMD_OPTION_VERSION,
TRACECMD_OPTION_PROCMAPS,
+ TRACECMD_OPTION_TRACEID,
};
enum {
@@ -151,6 +152,7 @@ int tracecmd_copy_headers(struct tracecmd_input *handle, int fd);
void tracecmd_set_flag(struct tracecmd_input *handle, int flag);
void tracecmd_clear_flag(struct tracecmd_input *handle, int flag);
unsigned long tracecmd_get_flags(struct tracecmd_input *handle);
+unsigned long long tracecmd_get_traceid(struct tracecmd_input *handle);
void tracecmd_parse_trace_clock(struct tracecmd_input *handle, char *file, int size);
diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c
index 209c1c98..8b5405fb 100644
--- a/lib/trace-cmd/trace-input.c
+++ b/lib/trace-cmd/trace-input.c
@@ -82,6 +82,7 @@ struct tracecmd_input {
struct tep_plugin_list *plugin_list;
struct tracecmd_input *parent;
unsigned long flags;
+ unsigned long long trace_id;
int fd;
int long_size;
int page_size;
@@ -2319,6 +2320,10 @@ static int handle_options(struct tracecmd_input *handle)
if (buf[size-1] == '\0')
trace_pid_map_load(handle, buf);
break;
+ case TRACECMD_OPTION_TRACEID:
+ handle->trace_id = tep_read_number(handle->pevent,
+ &cpus, 8);
+ break;
default:
warning("unknown option %d", option);
break;
@@ -3422,3 +3427,14 @@ void tracecmd_set_show_data_func(struct tracecmd_input *handle,
{
handle->show_data_func = func;
}
+
+/**
+ * tracecmd_get_traceid - get the trace id of the session
+ * @handle: input handle for the trace.dat file
+ *
+ * Returns the trace id, written in the trace file
+ */
+unsigned long long tracecmd_get_traceid(struct tracecmd_input *handle)
+{
+ return handle->trace_id;
+}
diff --git a/tracecmd/trace-dump.c b/tracecmd/trace-dump.c
index 415e9138..2dfeaa0f 100644
--- a/tracecmd/trace-dump.c
+++ b/tracecmd/trace-dump.c
@@ -358,6 +358,14 @@ static void dump_option_int(int fd, int size, char *desc)
do_print(OPTIONS, "%d\n", val);
}
+static void dump_option_xlong(int fd, int size, char *desc)
+{
+ long long val;
+
+ do_print(OPTIONS, "\t\t[Option %s, %d bytes]\n", desc, size);
+ read_file_number(fd, &val, size);
+ do_print(OPTIONS, "0x%llX\n", val);
+}
static void dump_options(int fd)
{
unsigned short option;
@@ -408,6 +416,9 @@ static void dump_options(int fd)
case TRACECMD_OPTION_PROCMAPS:
dump_option_string(fd, size, "PROCMAPS");
break;
+ case TRACECMD_OPTION_TRACEID:
+ dump_option_xlong(fd, size, "TRACEID");
+ break;
default:
do_print(OPTIONS, " %d %d\t[Unknown option, size - skipping]\n",
option, size);
diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
index 9cd8f590..4f8c4d46 100644
--- a/tracecmd/trace-record.c
+++ b/tracecmd/trace-record.c
@@ -3903,6 +3903,13 @@ add_pid_maps(struct tracecmd_output *handle, struct buffer_instance *instance)
trace_seq_destroy(&s);
}
+static void
+add_trace_id(struct tracecmd_output *handle, struct buffer_instance *instance)
+{
+ tracecmd_add_option(handle, TRACECMD_OPTION_TRACEID,
+ sizeof(long long), &instance->trace_id);
+}
+
static void
add_buffer_stat(struct tracecmd_output *handle, struct buffer_instance *instance)
{
@@ -4008,6 +4015,8 @@ static void add_options(struct tracecmd_output *handle, struct common_record_con
add_option_hooks(handle);
add_uname(handle);
add_version(handle);
+ if (!no_top_instance())
+ add_trace_id(handle, &top_instance);
}
static void write_guest_file(struct buffer_instance *instance)
--
2.24.1
next prev parent reply other threads:[~2020-03-04 9:12 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-04 9:12 [PATCH v22 00/13] Timestamp synchronization of host - guest tracing session Tzvetomir Stoyanov (VMware)
2020-03-04 9:12 ` [PATCH v22 01/13] trace-cmd: Find and store pids of tasks, which run virtual CPUs of given VM Tzvetomir Stoyanov (VMware)
2020-03-04 21:09 ` Steven Rostedt
2020-03-04 9:12 ` [PATCH v22 02/13] trace-cmd: Implement new API tracecmd_add_option_v() Tzvetomir Stoyanov (VMware)
2020-03-04 9:12 ` [PATCH v22 03/13] trace-cmd: Add new API to generate a unique ID of the tracing session Tzvetomir Stoyanov (VMware)
2020-03-04 9:12 ` Tzvetomir Stoyanov (VMware) [this message]
2020-03-04 9:12 ` [PATCH v22 05/13] trace-cmd: Add definitions of htonll() and ntohll() Tzvetomir Stoyanov (VMware)
2020-03-05 15:48 ` [PATCH] trace-cmd: Make functions in trace-write-local.h inline Steven Rostedt
2020-03-04 9:12 ` [PATCH v22 06/13] trace-cmd: Exchange tracing IDs between host and guest Tzvetomir Stoyanov (VMware)
2020-03-04 9:12 ` [PATCH v22 07/13] trace-cmd: Implement new option in trace.dat file: TRACECMD_OPTION_TIME_SHIFT Tzvetomir Stoyanov (VMware)
2020-03-05 17:46 ` [PATCH] trace-cmd: Adjust host_trace_info structure to be better packed Steven Rostedt
2020-03-04 9:12 ` [PATCH v22 08/13] trace-cmd: Add guest information in host's trace.dat file Tzvetomir Stoyanov (VMware)
2020-03-05 18:44 ` [PATCH] trace-cmd: Make name and cpu_pid into const pointers to tracecmd_get_guest_cpumap() Steven Rostedt
2020-03-04 9:12 ` [PATCH v22 09/13] trace-cmd: Add host trace clock as guest trace argument Tzvetomir Stoyanov (VMware)
2020-03-04 9:12 ` [PATCH v22 10/13] trace-cmd: Refactor few trace-cmd internal functions Tzvetomir Stoyanov (VMware)
2020-03-04 9:12 ` [PATCH v22 11/13] trace-cmd: Basic infrastructure for host - guest timestamp synchronization Tzvetomir Stoyanov (VMware)
2020-03-04 9:12 ` [PATCH v22 12/13] trace-cmd: [POC] PTP-like algorithm " Tzvetomir Stoyanov (VMware)
2020-03-04 9:12 ` [PATCH v22 13/13] 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=20200304091220.30936-5-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).