From: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com>
To: rostedt@goodmis.org
Cc: linux-trace-devel@vger.kernel.org
Subject: [PATCH v21 10/13] trace-cmd: Refactor few trace-cmd internal functions.
Date: Mon, 2 Mar 2020 12:14:01 +0200 [thread overview]
Message-ID: <20200302101404.150035-11-tz.stoyanov@gmail.com> (raw)
In-Reply-To: <20200302101404.150035-1-tz.stoyanov@gmail.com>
In order to reuse code inside trace-cmd application context,
few functions are made non static and "trace_" is prepended
to their names:
int trace_make_vsock(unsigned int port);
int trace_get_vsock_port(int sd, unsigned int *port);
int trace_open_vsock(unsigned int cid, unsigned int port);
char *trace_get_guest_file(const char *file, const char *guest);
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
---
tracecmd/include/trace-local.h | 6 ++++++
tracecmd/trace-agent.c | 10 +++++-----
tracecmd/trace-record.c | 18 +++++++++---------
3 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/tracecmd/include/trace-local.h b/tracecmd/include/trace-local.h
index dc934f28..95d0026b 100644
--- a/tracecmd/include/trace-local.h
+++ b/tracecmd/include/trace-local.h
@@ -263,6 +263,12 @@ void tracecmd_disable_tracing(void);
void tracecmd_enable_tracing(void);
void tracecmd_stat_cpu(struct trace_seq *s, int cpu);
+int trace_make_vsock(unsigned int port);
+int trace_get_vsock_port(int sd, unsigned int *port);
+int trace_open_vsock(unsigned int cid, unsigned int port);
+
+char *trace_get_guest_file(const char *file, const char *guest);
+
/* No longer in event-utils.h */
void __noreturn die(const char *fmt, ...); /* Can be overriden */
void *malloc_or_die(unsigned int size); /* Can be overridden */
diff --git a/tracecmd/trace-agent.c b/tracecmd/trace-agent.c
index 52d27195..a8ef0852 100644
--- a/tracecmd/trace-agent.c
+++ b/tracecmd/trace-agent.c
@@ -40,7 +40,7 @@ static int get_local_cid(unsigned int *cid)
return ret;
}
-static int make_vsock(unsigned int port)
+int trace_make_vsock(unsigned int port)
{
struct sockaddr_vm addr = {
.svm_family = AF_VSOCK,
@@ -64,7 +64,7 @@ static int make_vsock(unsigned int port)
return sd;
}
-static int get_vsock_port(int sd, unsigned int *port)
+int trace_get_vsock_port(int sd, unsigned int *port)
{
struct sockaddr_vm addr;
socklen_t addr_len = sizeof(addr);
@@ -87,11 +87,11 @@ static void make_vsocks(int nr, int *fds, unsigned int *ports)
int i, fd, ret;
for (i = 0; i < nr; i++) {
- fd = make_vsock(VMADDR_PORT_ANY);
+ fd = trace_make_vsock(VMADDR_PORT_ANY);
if (fd < 0)
die("Failed to open vsocket");
- ret = get_vsock_port(fd, &port);
+ ret = trace_get_vsock_port(fd, &port);
if (ret < 0)
die("Failed to get vsocket address");
@@ -210,7 +210,7 @@ static void agent_serve(unsigned int port)
nr_cpus = tracecmd_count_cpus();
page_size = getpagesize();
- sd = make_vsock(port);
+ sd = trace_make_vsock(port);
if (sd < 0)
die("Failed to open vsocket");
diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
index e0b18044..174a9bdd 100644
--- a/tracecmd/trace-record.c
+++ b/tracecmd/trace-record.c
@@ -537,7 +537,7 @@ static char *get_temp_file(struct buffer_instance *instance, int cpu)
return file;
}
-static char *get_guest_file(const char *file, const char *guest)
+char *trace_get_guest_file(const char *file, const char *guest)
{
const char *p;
char *out = NULL;
@@ -2930,7 +2930,7 @@ static int connect_port(const char *host, unsigned int port)
}
#ifdef VSOCK
-static int open_vsock(unsigned int cid, unsigned int port)
+int trace_open_vsock(unsigned int cid, unsigned int port)
{
struct sockaddr_vm addr = {
.svm_family = AF_VSOCK,
@@ -2993,7 +2993,7 @@ static bool can_splice_read_vsock(void)
}
#else
-static inline int open_vsock(unsigned int cid, unsigned int port)
+int trace_open_vsock(unsigned int cid, unsigned int port)
{
die("vsock is not supported");
return -1;
@@ -3304,7 +3304,7 @@ create_recorder_instance(struct buffer_instance *instance, const char *file, int
if (instance->use_fifos)
fd = instance->fds[cpu];
else
- fd = open_vsock(instance->cid, instance->client_ports[cpu]);
+ fd = trace_open_vsock(instance->cid, instance->client_ports[cpu]);
if (fd < 0)
die("Failed to connect to agent");
@@ -3696,7 +3696,7 @@ static void connect_to_agent(struct buffer_instance *instance)
use_fifos = nr_fifos > 0;
}
- sd = open_vsock(instance->cid, instance->port);
+ sd = trace_open_vsock(instance->cid, instance->port);
if (sd < 0)
die("Failed to connect to vsocket @%u:%u",
instance->cid, instance->port);
@@ -3747,8 +3747,8 @@ static void setup_guest(struct buffer_instance *instance)
int fd;
/* Create a place to store the guest meta data */
- file = get_guest_file(output_file,
- tracefs_instance_get_name(instance->tracefs));
+ file = trace_get_guest_file(output_file,
+ tracefs_instance_get_name(instance->tracefs));
if (!file)
die("Failed to allocate memory");
@@ -4084,8 +4084,8 @@ static void write_guest_file(struct buffer_instance *instance)
char **temp_files;
int i, fd;
- file = get_guest_file(output_file,
- tracefs_instance_get_name(instance->tracefs));
+ file = trace_get_guest_file(output_file,
+ tracefs_instance_get_name(instance->tracefs));
if (!file)
die("Failed to allocate memory");
--
2.24.1
next prev parent reply other threads:[~2020-03-02 10:14 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-02 10:13 [PATCH v21 00/13] Timestamp synchronization of host - guest tracing session Tzvetomir Stoyanov (VMware)
2020-03-02 10:13 ` [PATCH v21 01/13] trace-cmd: Find and store pids of tasks, which run virtual CPUs of given VM Tzvetomir Stoyanov (VMware)
2020-03-02 16:25 ` Steven Rostedt
2020-03-02 16:33 ` Steven Rostedt
2020-03-02 10:13 ` [PATCH v21 02/13] trace-cmd: Implement new API tracecmd_add_option_v() Tzvetomir Stoyanov (VMware)
2020-03-02 10:13 ` [PATCH v21 03/13] trace-cmd: Add new API to generate a unique ID of the tracing session Tzvetomir Stoyanov (VMware)
2020-03-02 10:13 ` [PATCH v21 04/13] trace-cmd: Store the session tracing ID in the trace.dat file Tzvetomir Stoyanov (VMware)
2020-03-02 10:13 ` [PATCH v21 05/13] trace-cmd: Add definitions of htonll() and ntohll() Tzvetomir Stoyanov (VMware)
2020-03-02 10:13 ` [PATCH v21 06/13] trace-cmd: Exchange tracing IDs between host and guest Tzvetomir Stoyanov (VMware)
2020-03-02 10:13 ` [PATCH v21 07/13] trace-cmd: Implement new option in trace.dat file: TRACECMD_OPTION_TIME_SHIFT Tzvetomir Stoyanov (VMware)
2020-03-02 10:13 ` [PATCH v21 08/13] trace-cmd: Add guest information in host's trace.dat file Tzvetomir Stoyanov (VMware)
2020-03-02 10:14 ` [PATCH v21 09/13] trace-cmd: Add host trace clock as guest trace argument Tzvetomir Stoyanov (VMware)
2020-03-02 10:14 ` Tzvetomir Stoyanov (VMware) [this message]
2020-03-02 10:14 ` [PATCH v21 11/13] trace-cmd: Basic infrastructure for host - guest timestamp synchronization Tzvetomir Stoyanov (VMware)
2020-03-02 16:43 ` Steven Rostedt
2020-03-04 9:11 ` Tzvetomir Stoyanov
2020-03-02 10:14 ` [PATCH v21 12/13] trace-cmd: [POC] PTP-like algorithm " Tzvetomir Stoyanov (VMware)
2020-03-02 10:14 ` [PATCH v21 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=20200302101404.150035-11-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.