Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9720CC432C0 for ; Fri, 29 Nov 2019 10:17:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6AD5620833 for ; Fri, 29 Nov 2019 10:17:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="k/x9gq8w" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726651AbfK2KR4 (ORCPT ); Fri, 29 Nov 2019 05:17:56 -0500 Received: from mail-lf1-f67.google.com ([209.85.167.67]:35912 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726888AbfK2KR4 (ORCPT ); Fri, 29 Nov 2019 05:17:56 -0500 Received: by mail-lf1-f67.google.com with SMTP id f16so22233048lfm.3 for ; Fri, 29 Nov 2019 02:17:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bzEwug/40m8ZvyhZ632ZBE59iLeXEZb5sxMd3ibrnBs=; b=k/x9gq8wYKuLfN/ohn1Gal8XCnTVvj9mH4G6qS/BH0Zfc5p6zYxAbtbEJRJYCZ/QdL y2u6ZRHgKxpn8oypCg/RrK4XV9v015Ibvb4luxiIVBKli164JUcFtUvbczDx0K/yWUgX 5Bs9Urxqr4J3VklnOY2LNHXd/JByoSDs+f/8e0dpssWdNlyfpEN7lMFnjVm+5pflPzh6 dEsu4fBKEDS9ZtqYIc69wQX7PyvCU7nUZR2SN6z2Kf+tSeUEN8Gvaq+oSSrQmaBvAp6N YvfLPC8VOQRrmwLvGIH3NXtBWf3Re2NA7BGTne8JD+A67/wbG3GFpycuUxRhgfZb31sR t/0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bzEwug/40m8ZvyhZ632ZBE59iLeXEZb5sxMd3ibrnBs=; b=sPdD9ftlzOcSWt5e2z+wJPbvM7zyZcuZgUfxelyMWaAz0mwzKhKsQ32b89jZW3c6zs s4DQaDQ9tOCRIKDtM/4vbgWd5uft4bwjhwMdLl8tGnNj95qhFrlnex3IL+n8o3KDmUQU 7QeybbNL7wQAvE5340tQppgDMyjDgZFGD83B2YsQ5a9p1gQFuLlD4AARLbSEYr+9/LLj ZEai2nhR0aRiQUrkJG4+bYLHqrpQJDn35lQAIAYUZckyrkwiGe9EgLwX09GQCbgMaYt2 ramTYNuN5HOU0CzPB5D2kyOtVdC/KCtKOsr3ZmO6OGP+dEaXitPK6YlA8PHO6mfXOEhX KWtw== X-Gm-Message-State: APjAAAW3+FOLsxKy1Y3bDmgISD5JuCwlpCfFscbBNi9N0MLgL5P717Jq /qNNuWVX2Lr7bj8EzdmKoA4= X-Google-Smtp-Source: APXvYqwVapYGee7y7gtVOMxQzNWoDm8MamW+Ul5J6Kth+rMk7CslnRr9Ok8E8XBswsjTfcbP+BQ+gg== X-Received: by 2002:a19:7610:: with SMTP id c16mr32184871lff.120.1575022673898; Fri, 29 Nov 2019 02:17:53 -0800 (PST) Received: from oberon.eng.vmware.com ([146.247.46.5]) by smtp.gmail.com with ESMTPSA id x29sm11367935lfg.45.2019.11.29.02.17.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Nov 2019 02:17:53 -0800 (PST) From: "Tzvetomir Stoyanov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org Subject: [PATCH v16 15/18] trace-cmd: Refactor few trace-cmd internal functions. Date: Fri, 29 Nov 2019 12:17:30 +0200 Message-Id: <20191129101733.375808-16-tz.stoyanov@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191129101733.375808-1-tz.stoyanov@gmail.com> References: <20191129101733.375808-1-tz.stoyanov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-trace-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org In order to reuse code inside trace-cmd application context, few functions are made non static: int make_vsock(unsigned int port); int get_vsock_port(int sd, unsigned int *port); int open_vsock(unsigned int cid, unsigned int port); char *get_guest_file(const char *file, const char *guest); Signed-off-by: Tzvetomir Stoyanov (VMware) --- tracecmd/include/trace-local.h | 8 ++++++++ tracecmd/trace-agent.c | 4 ++-- tracecmd/trace-record.c | 8 ++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/tracecmd/include/trace-local.h b/tracecmd/include/trace-local.h index a6f79c5..17ef31a 100644 --- a/tracecmd/include/trace-local.h +++ b/tracecmd/include/trace-local.h @@ -19,6 +19,8 @@ #define GUEST_FIFO_FMT GUEST_DIR_FMT "/" GUEST_PIPE_NAME "%d" #define VIRTIO_FIFO_FMT "/dev/virtio-ports/" GUEST_PIPE_NAME "%d" +#define TRACE_FILENAME "trace.dat" + /* fix stupid glib guint64 typecasts and printf formats */ typedef unsigned long long u64; @@ -258,6 +260,12 @@ void tracecmd_disable_tracing(void); void tracecmd_enable_tracing(void); void tracecmd_stat_cpu(struct trace_seq *s, int cpu); +int make_vsock(unsigned int port); +int get_vsock_port(int sd, unsigned int *port); +int open_vsock(unsigned int cid, unsigned int port); + +char *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 cc330b7..530f972 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 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 get_vsock_port(int sd, unsigned int *port) { struct sockaddr_vm addr; socklen_t addr_len = sizeof(addr); diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c index e7fb1bd..e66f999 100644 --- a/tracecmd/trace-record.c +++ b/tracecmd/trace-record.c @@ -68,7 +68,7 @@ static int rt_prio; static int keep; -static const char *output_file = "trace.dat"; +static const char *output_file = TRACE_FILENAME; static int latency; static int sleep_time = 1000; @@ -536,7 +536,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 *get_guest_file(const char *file, const char *guest) { const char *p; char *out = NULL; @@ -2772,7 +2772,7 @@ static int connect_port(const char *host, unsigned int port) } #ifdef VSOCK -static int open_vsock(unsigned int cid, unsigned int port) +int open_vsock(unsigned int cid, unsigned int port) { struct sockaddr_vm addr = { .svm_family = AF_VSOCK, @@ -2835,7 +2835,7 @@ static bool can_splice_read_vsock(void) } #else -static inline int open_vsock(unsigned int cid, unsigned int port) +int open_vsock(unsigned int cid, unsigned int port) { die("vsock is not supported"); return -1; -- 2.23.0