From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752684Ab3LQDA0 (ORCPT ); Mon, 16 Dec 2013 22:00:26 -0500 Received: from mail7.hitachi.co.jp ([133.145.228.42]:36683 "EHLO mail7.hitachi.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751551Ab3LQDAX (ORCPT ); Mon, 16 Dec 2013 22:00:23 -0500 X-AuditID: 85900ec0-d312bb9000001514-ae-52afbe448c3b Subject: [PATCH V3 1/6] [CLEANUP] trace-cmd: Split out binding a port and fork reader from open_udp() To: Steven Rostedt From: Yoshihiro YUNOMAE Cc: Hidehiro Kawai , Masami Hiramatsu , Aaron Fabbri , linux-kernel@vger.kernel.org, yrl.pp-manager.tt@hitachi.com Date: Tue, 17 Dec 2013 12:00:20 +0900 Message-ID: <20131217030020.31730.35555.stgit@yunodevel> In-Reply-To: <20131217030017.31730.66046.stgit@yunodevel> References: <20131217030017.31730.66046.stgit@yunodevel> User-Agent: StGit/0.16 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Brightmail-Tracker: AAAAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Split out binding a port and fork reader from open_udp() for avoiding duplicate codes between listen mode and virt-server mode. Changes in V2: Add a comment in open_udp() Signed-off-by: Yoshihiro YUNOMAE --- trace-listen.c | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/trace-listen.c b/trace-listen.c index 8b8f02c..bf187c9 100644 --- a/trace-listen.c +++ b/trace-listen.c @@ -228,13 +228,12 @@ static void process_udp_child(int sfd, const char *host, const char *port, #define START_PORT_SEARCH 1500 #define MAX_PORT_SEARCH 6000 -static int open_udp(const char *node, const char *port, int *pid, - int cpu, int pagesize, int start_port) +static int udp_bind_a_port(int start_port, int *sfd) { struct addrinfo hints; struct addrinfo *result, *rp; - int sfd, s; char buf[BUFSIZ]; + int s; int num_port = start_port; again: @@ -250,15 +249,15 @@ static int open_udp(const char *node, const char *port, int *pid, pdie("getaddrinfo: error opening udp socket"); for (rp = result; rp != NULL; rp = rp->ai_next) { - sfd = socket(rp->ai_family, rp->ai_socktype, - rp->ai_protocol); - if (sfd < 0) + *sfd = socket(rp->ai_family, rp->ai_socktype, + rp->ai_protocol); + if (*sfd < 0) continue; - if (bind(sfd, rp->ai_addr, rp->ai_addrlen) == 0) + if (bind(*sfd, rp->ai_addr, rp->ai_addrlen) == 0) break; - close(sfd); + close(*sfd); } if (rp == NULL) { @@ -270,6 +269,12 @@ static int open_udp(const char *node, const char *port, int *pid, freeaddrinfo(result); + return num_port; +} + +static void fork_udp_reader(int sfd, const char *node, const char *port, + int *pid, int cpu, int pagesize) +{ *pid = fork(); if (*pid < 0) @@ -279,6 +284,23 @@ static int open_udp(const char *node, const char *port, int *pid, process_udp_child(sfd, node, port, cpu, pagesize); close(sfd); +} + +static int open_udp(const char *node, const char *port, int *pid, + int cpu, int pagesize, int start_port) +{ + int sfd; + int num_port; + + /* + * udp_bind_a_port() currently does not return an error, but if that + * changes in the future, we have a check for it now. + */ + num_port = udp_bind_a_port(start_port, &sfd); + if (num_port < 0) + return num_port; + + fork_udp_reader(sfd, node, port, pid, cpu, pagesize); return num_port; }