diff options
| author | Steven Rostedt (Google) <rostedt@goodmis.org> | 2022-04-20 11:26:35 -0400 |
|---|---|---|
| committer | Steven Rostedt (Google) <rostedt@goodmis.org> | 2022-04-26 20:50:18 -0400 |
| commit | b94ae17125adaa7c22346e5c000e9c2e903a53b8 (patch) | |
| tree | 092de6796c8bbecde5e4cc0c30161c224190f8a6 | |
| parent | dd6e8312f53bf95210dedb80ae35b85d319f4c38 (diff) | |
| download | trace-cmd-b94ae17125adaa7c22346e5c000e9c2e903a53b8.tar.gz | |
trace-cmd agent: Have agent work without vsockets available
Compile agent code without vsockets available to allow it to work with
networking. This includes allowing the ptp time synchronization protocol
to be used.
Link: https://lore.kernel.org/linux-trace-devel/20220420152637.13105-10-rostedt@goodmis.org
Link: https://lore.kernel.org/linux-trace-devel/20220417184538.1044417-10-rostedt@goodmis.org
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
| -rw-r--r-- | lib/trace-cmd/Makefile | 2 | ||||
| -rw-r--r-- | lib/trace-cmd/include/trace-tsync-local.h | 6 | ||||
| -rw-r--r-- | tracecmd/Makefile | 5 | ||||
| -rw-r--r-- | tracecmd/trace-cmd.c | 2 | ||||
| -rw-r--r-- | tracecmd/trace-usage.c | 2 |
5 files changed, 4 insertions, 13 deletions
diff --git a/lib/trace-cmd/Makefile b/lib/trace-cmd/Makefile index da0ad4de..9374b163 100644 --- a/lib/trace-cmd/Makefile +++ b/lib/trace-cmd/Makefile @@ -21,8 +21,8 @@ ifeq ($(PERF_DEFINED), 1) OBJS += trace-perf.o endif OBJS += trace-timesync.o -ifeq ($(VSOCK_DEFINED), 1) OBJS += trace-timesync-ptp.o +ifeq ($(VSOCK_DEFINED), 1) OBJS += trace-timesync-kvm.o endif OBJS += trace-compress.o diff --git a/lib/trace-cmd/include/trace-tsync-local.h b/lib/trace-cmd/include/trace-tsync-local.h index 885c9f51..5bbc1db6 100644 --- a/lib/trace-cmd/include/trace-tsync-local.h +++ b/lib/trace-cmd/include/trace-tsync-local.h @@ -64,15 +64,11 @@ int tracecmd_tsync_proto_register(const char *proto_name, int accuracy, int role long long *, long long *, long long*, long long *, unsigned int)); int tracecmd_tsync_proto_unregister(char *proto_name); +int ptp_clock_sync_register(void); #ifdef VSOCK -int ptp_clock_sync_register(void); int kvm_clock_sync_register(void); #else -static inline int ptp_clock_sync_register(void) -{ - return 0; -} static inline int kvm_clock_sync_register(void) { return 0; diff --git a/tracecmd/Makefile b/tracecmd/Makefile index 13f7776e..0114948f 100644 --- a/tracecmd/Makefile +++ b/tracecmd/Makefile @@ -37,11 +37,10 @@ TRACE_CMD_OBJS += trace-dump.o TRACE_CMD_OBJS += trace-clear.o TRACE_CMD_OBJS += trace-vm.o TRACE_CMD_OBJS += trace-convert.o -TRACE_CMD_OBJS += trace-vsock.o - -ifeq ($(VSOCK_DEFINED), 1) TRACE_CMD_OBJS += trace-agent.o TRACE_CMD_OBJS += trace-setup-guest.o +ifeq ($(VSOCK_DEFINED), 1) +TRACE_CMD_OBJS += trace-vsock.o endif ALL_OBJS := $(TRACE_CMD_OBJS:%.o=$(bdir)/%.o) diff --git a/tracecmd/trace-cmd.c b/tracecmd/trace-cmd.c index 3f3e69a7..69800d26 100644 --- a/tracecmd/trace-cmd.c +++ b/tracecmd/trace-cmd.c @@ -127,10 +127,8 @@ struct command commands[] = { {"hist", trace_hist}, {"mem", trace_mem}, {"listen", trace_listen}, -#ifdef VSOCK {"agent", trace_agent}, {"setup-guest", trace_setup_guest}, -#endif {"split", trace_split}, {"restore", trace_restore}, {"stack", trace_stack}, diff --git a/tracecmd/trace-usage.c b/tracecmd/trace-usage.c index ec637655..88eac10a 100644 --- a/tracecmd/trace-usage.c +++ b/tracecmd/trace-usage.c @@ -325,7 +325,6 @@ static struct usage_help usage_help[] = { " -l logfile to write messages to.\n" " --verbose 'level' Set the desired log level\n" }, -#ifdef VSOCK { "agent", "listen on a vsocket for trace clients", @@ -344,7 +343,6 @@ static struct usage_help usage_help[] = { " -g FIFOs group owner\n" " -a Attach FIFOs to guest VM config\n" }, -#endif { "list", "list the available events, plugins or options", |