From: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com>
To: rostedt@goodmis.org
Cc: linux-trace-devel@vger.kernel.org
Subject: [PATCH v25 05/16] trace-cmd: Add clock parameter to timestamp synchronization plugins
Date: Thu, 29 Oct 2020 13:18:05 +0200 [thread overview]
Message-ID: <20201029111816.247241-6-tz.stoyanov@gmail.com> (raw)
In-Reply-To: <20201029111816.247241-1-tz.stoyanov@gmail.com>
Some timestamp synchronization plugins may not support all ftrace
clocks. Added logic to timestamp synchronization plugins to declare what
ftace clocks they support. Added logic to select plugin depending on the
ftrace clock used in the current trace session and supported clocks.
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
---
include/trace-cmd/trace-cmd.h | 4 ++--
lib/trace-cmd/include/trace-tsync-local.h | 1 +
lib/trace-cmd/trace-timesync.c | 29 +++++++++++++++++++----
tracecmd/trace-record.c | 10 +++++++-
tracecmd/trace-tsync.c | 2 +-
5 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/include/trace-cmd/trace-cmd.h b/include/trace-cmd/trace-cmd.h
index b48381cd..21028940 100644
--- a/include/trace-cmd/trace-cmd.h
+++ b/include/trace-cmd/trace-cmd.h
@@ -448,8 +448,8 @@ struct tracecmd_time_sync {
};
void tracecmd_tsync_init(void);
-int tracecmd_tsync_proto_getall(char ***protos);
-char *tracecmd_tsync_proto_select(char **protos);
+int tracecmd_tsync_proto_getall(char ***protos, const char *clock);
+char *tracecmd_tsync_proto_select(char **protos, char *clock);
bool tsync_proto_is_supported(char *proto_name);
void tracecmd_tsync_with_host(struct tracecmd_time_sync *tsync);
void tracecmd_tsync_with_guest(struct tracecmd_time_sync *tsync);
diff --git a/lib/trace-cmd/include/trace-tsync-local.h b/lib/trace-cmd/include/trace-tsync-local.h
index 1f3bc443..25d5b4e8 100644
--- a/lib/trace-cmd/include/trace-tsync-local.h
+++ b/lib/trace-cmd/include/trace-tsync-local.h
@@ -27,6 +27,7 @@ struct clock_sync_context {
};
int tracecmd_tsync_proto_register(char *proto_name, int accuracy,
+ int supported_clocks,
int (*init)(struct tracecmd_time_sync *),
int (*free)(struct tracecmd_time_sync *),
int (*calc)(struct tracecmd_time_sync *,
diff --git a/lib/trace-cmd/trace-timesync.c b/lib/trace-cmd/trace-timesync.c
index 58c92ef3..8ca47bf6 100644
--- a/lib/trace-cmd/trace-timesync.c
+++ b/lib/trace-cmd/trace-timesync.c
@@ -26,6 +26,7 @@ struct tsync_proto {
struct tsync_proto *next;
char proto_name[TRACECMD_TSYNC_PNAME_LENGTH];
int accuracy;
+ int supported_clocks;
int (*clock_sync_init)(struct tracecmd_time_sync *clock_context);
int (*clock_sync_free)(struct tracecmd_time_sync *clock_context);
@@ -50,6 +51,7 @@ static struct tsync_proto *tsync_proto_find(char *proto_name)
}
int tracecmd_tsync_proto_register(char *proto_name, int accuracy,
+ int supported_clocks,
int (*init)(struct tracecmd_time_sync *),
int (*free)(struct tracecmd_time_sync *),
int (*calc)(struct tracecmd_time_sync *,
@@ -64,6 +66,7 @@ int tracecmd_tsync_proto_register(char *proto_name, int accuracy,
return -1;
strncpy(proto->proto_name, proto_name, TRACECMD_TSYNC_PNAME_LENGTH);
proto->accuracy = accuracy;
+ proto->supported_clocks = supported_clocks;
proto->clock_sync_init = init;
proto->clock_sync_free = free;
proto->clock_sync_calc = calc;
@@ -137,20 +140,26 @@ int tracecmd_tsync_get_offsets(struct tracecmd_time_sync *tsync,
* timestamp synchronization with a peer
*
* @protos: array of pointers to protocol names
+ * @clock : trace clock
*
* Retuns pointer to a protocol name, that can be used with the peer, or NULL
* in case there is no match with supported protocols.
* The returned string MUST NOT be freed by the caller
*/
-char *tracecmd_tsync_proto_select(char **protos)
+char *tracecmd_tsync_proto_select(char **protos, char *clock)
{
struct tsync_proto *selected = NULL;
struct tsync_proto *proto;
char **pname;
+ int clock_id = 0;
+ clock_id = tracecmd_clock_str2id(clock);
pname = protos;
while (*pname) {
for (proto = tsync_proto_list; proto; proto = proto->next) {
+ if (proto->supported_clocks && clock_id &&
+ !(proto->supported_clocks & clock_id))
+ continue;
if (strncmp(proto->proto_name, *pname, TRACECMD_TSYNC_PNAME_LENGTH))
continue;
if (selected) {
@@ -173,26 +182,38 @@ char *tracecmd_tsync_proto_select(char **protos)
* time sync protocols
* @protos: return, allocated array of time sync protocol names,
* supported by the peer. Must be freed by free()
+ * @clock: selected trace clock
*
* If completed successfully 0 is returned and allocated array in @protos of
* strings. The last array entry is NULL. In case of an error, -1 is returned.
* @protos must be freed with free()
*/
-int tracecmd_tsync_proto_getall(char ***protos)
+int tracecmd_tsync_proto_getall(char ***protos, const char *clock)
{
struct tsync_proto *proto;
+ int clock_id = 0;
int count = 1;
int i;
- for (proto = tsync_proto_list; proto; proto = proto->next)
+ if (clock)
+ clock_id = tracecmd_clock_str2id(clock);
+ for (proto = tsync_proto_list; proto; proto = proto->next) {
+ if (proto->supported_clocks && clock_id &&
+ !(proto->supported_clocks & clock_id))
+ continue;
count++;
+ }
*protos = calloc(count, sizeof(char *));
if (!protos)
return -1;
- for (i = 0, proto = tsync_proto_list; proto && i < (count - 1); proto = proto->next)
+ for (i = 0, proto = tsync_proto_list; proto && i < (count - 1); proto = proto->next) {
+ if (proto->supported_clocks && clock_id &&
+ !(proto->supported_clocks & clock_id))
+ continue;
(*protos)[i++] = proto->proto_name;
+ }
return 0;
}
diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
index 1149aaaa..41e0dd3a 100644
--- a/tracecmd/trace-record.c
+++ b/tracecmd/trace-record.c
@@ -3675,8 +3675,11 @@ static void connect_to_agent(struct buffer_instance *instance)
if (!msg_handle)
die("Failed to allocate message handle");
+ if (!instance->clock)
+ instance->clock = tracefs_get_clock(NULL);
+
if (instance->tsync.loop_interval >= 0)
- tracecmd_tsync_proto_getall(&protos);
+ tracecmd_tsync_proto_getall(&protos, instance->clock);
ret = tracecmd_msg_send_trace_req(msg_handle, instance->argc,
instance->argv, use_fifos,
@@ -6112,6 +6115,11 @@ static void parse_record_options(int argc,
(char *)top_instance.clock,
true);
add_argv(instance, "-C", true);
+ if (!instance->clock) {
+ instance->clock = strdup((char *)top_instance.clock);
+ if (!instance->clock)
+ die("Could not allocate instance clock");
+ }
}
}
instance->tsync.loop_interval = top_instance.tsync.loop_interval;
diff --git a/tracecmd/trace-tsync.c b/tracecmd/trace-tsync.c
index bd96110d..2c8afe30 100644
--- a/tracecmd/trace-tsync.c
+++ b/tracecmd/trace-tsync.c
@@ -219,7 +219,7 @@ char *tracecmd_guest_tsync(char **tsync_protos, char *clock,
int fd;
fd = -1;
- proto = tracecmd_tsync_proto_select(tsync_protos);
+ proto = tracecmd_tsync_proto_select(tsync_protos, clock);
if (!proto)
return NULL;
#ifdef VSOCK
--
2.26.2
next prev parent reply other threads:[~2020-10-29 11:18 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-29 11:18 [PATCH v25 00/16] Timestamp synchronization of host - guest tracing session Tzvetomir Stoyanov (VMware)
2020-10-29 11:18 ` [PATCH v25 01/16] trace-cmd: Replace time sync protocol ID with string Tzvetomir Stoyanov (VMware)
2020-11-05 14:52 ` Steven Rostedt
2020-12-02 22:43 ` Steven Rostedt
2020-10-29 11:18 ` [PATCH v25 02/16] trace-cmd: Add trace-cmd library APIs for ftrace clock name Tzvetomir Stoyanov (VMware)
2020-10-29 11:18 ` [PATCH v25 03/16] trace-cmd: Move VM related logic in a separate file Tzvetomir Stoyanov (VMware)
2020-10-29 11:18 ` [PATCH v25 04/16] trace-cmd: Add new libtrasefs API to get the current trace clock Tzvetomir Stoyanov (VMware)
2020-10-29 11:18 ` Tzvetomir Stoyanov (VMware) [this message]
2020-12-02 22:48 ` [PATCH v25 05/16] trace-cmd: Add clock parameter to timestamp synchronization plugins Steven Rostedt
2020-12-03 13:09 ` Tzvetomir Stoyanov
2020-10-29 11:18 ` [PATCH v25 06/16] trace-cmd: Add role " Tzvetomir Stoyanov (VMware)
2020-12-02 23:04 ` Steven Rostedt
2020-10-29 11:18 ` [PATCH v25 07/16] trace-cmd: Add host / guest role in timestamp synchronization context Tzvetomir Stoyanov (VMware)
2020-12-02 23:07 ` Steven Rostedt
2020-10-29 11:18 ` [PATCH v25 08/16] trace-cmd: Add guest CPU count PID in tracecmd_time_sync struct Tzvetomir Stoyanov (VMware)
2020-10-29 11:18 ` [PATCH v25 09/16] trace-cmd: Add scaling ratio for timestamp correction Tzvetomir Stoyanov (VMware)
2020-12-03 1:47 ` Steven Rostedt
2020-12-03 12:56 ` Tzvetomir Stoyanov
2020-10-29 11:18 ` [PATCH v25 10/16] trace-cmd: Add time sync protocol flags Tzvetomir Stoyanov (VMware)
2020-12-03 2:09 ` Steven Rostedt
2020-12-03 12:59 ` Tzvetomir Stoyanov
2020-10-29 11:18 ` [PATCH v25 11/16] trace-cmd: Add timestamp synchronization per vCPU Tzvetomir Stoyanov (VMware)
2020-10-29 11:18 ` [PATCH v25 12/16] trace-cmd: Define a macro for packed structures Tzvetomir Stoyanov (VMware)
2020-10-29 11:18 ` [PATCH v25 13/16] trace-cmd: Add dummy function to initialize timestamp sync logic Tzvetomir Stoyanov (VMware)
2020-10-29 11:18 ` [PATCH v25 14/16] trace-cmd: [POC] PTP-like algorithm for host - guest timestamp synchronization Tzvetomir Stoyanov (VMware)
2020-10-29 11:18 ` [PATCH v25 15/16] trace-cmd: Debug scripts for " Tzvetomir Stoyanov (VMware)
2020-10-29 11:18 ` [PATCH v25 16/16] trace-cmd [POC]: Add KVM timestamp synchronization plugin 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=20201029111816.247241-6-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.