Soft Patch Panel
 help / color / mirror / Atom feed
From: ogawa.yasufumi@lab.ntt.co.jp
To: spp@dpdk.org, ferruh.yigit@intel.com
Cc: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
Subject: [spp] [PATCH 9/9] shared: fix bug for print port status
Date: Mon, 12 Mar 2018 14:35:24 +0900	[thread overview]
Message-ID: <1520832924-28387-10-git-send-email-ogawa.yasufumi@lab.ntt.co.jp> (raw)
In-Reply-To: <1520832924-28387-1-git-send-email-ogawa.yasufumi@lab.ntt.co.jp>

From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>

Result of print_active_ports() is invalid format if sec has no ports.
This update is to fix for this case.

Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
 src/shared/common.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/shared/common.c b/src/shared/common.c
index 1ef63de..b11cb6d 100644
--- a/src/shared/common.c
+++ b/src/shared/common.c
@@ -32,7 +32,6 @@
  */
 
 #include <rte_cycles.h>
-
 #include "common.h"
 
 /* Check the link status of all ports in up to 9s, and print them finally */
@@ -263,9 +262,10 @@ print_active_ports(char *str,
 		struct port_map *port_map)
 {
 	unsigned int i;
+	const char *port_prefix = "ports: '";
 
 	/* Every elements value */
-	sprintf(str, "ports: ");
+	sprintf(str, "%s",  port_prefix);
 	for (i = 0; i < RTE_MAX_ETHPORTS; i++) {
 		if (ports_fwd_array[i].in_port_id == PORT_RESET)
 			continue;
@@ -313,7 +313,7 @@ print_active_ports(char *str,
 			break;
 		case UNDEF:
 			RTE_LOG(INFO, APP, "Type: UDF\n");
-			/* TODO(yasufum) remove print for undefined ? */
+			/* TODO(yasufum) Need to remove print for undefined ? */
 			sprintf(str + strlen(str), "udf-");
 			break;
 		}
@@ -352,11 +352,22 @@ print_active_ports(char *str,
 				break;
 			case UNDEF:
 				RTE_LOG(INFO, APP, "Type: UDF\n");
-				/* TODO(yasufum) remove print for undefined ? */
+				/**
+				 * TODO(yasufum) Need to remove print for
+				 * undefined ?
+				 */
 				sprintf(str + strlen(str), "udf,");
 				break;
 			}
 		}
 	}
-	sprintf(str + strlen(str) - 1, "%c", '\0');
+
+	// If there are no ports, it's formatted as "ports: ''"
+	if (strcmp(str, port_prefix) == 0) {
+		sprintf(str + strlen(str), "'");
+	} else {  // Remove last ','
+		sprintf(str + strlen(str) - 1, "'");
+	}
+	// make sure to be terminated with null character
+	sprintf(str + strlen(str), "%c", '\0');
 }
-- 
2.7.4

  parent reply	other threads:[~2018-03-12  5:35 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-01  9:28 [spp] Port ID incrementation is changed from DPDK18.02 Yasufumi Ogawa
2018-03-12  5:35 ` [spp] [PATCH 0/9] Update port management ogawa.yasufumi
2018-03-12  5:35   ` [spp] [PATCH 1/9] controller: change displaying status ogawa.yasufumi
2018-03-12  5:35   ` [spp] [PATCH 2/9] shared: update print_active_ports ogawa.yasufumi
2018-03-12  5:35   ` [spp] [PATCH 3/9] spp_nfv: change format displaying status ogawa.yasufumi
2018-03-12  5:35   ` [spp] [PATCH 4/9] spp_vm: " ogawa.yasufumi
2018-03-12  5:35   ` [spp] [PATCH 5/9] controller: add delimiter for topo command ogawa.yasufumi
2018-03-12  5:35   ` [spp] [PATCH 6/9] controller: update Shell for topo_subgraph ogawa.yasufumi
2018-03-12  5:35   ` [spp] [PATCH 7/9] controller: update generating graph ogawa.yasufumi
2018-03-12  5:35   ` [spp] [PATCH 8/9] controller: update topo command ogawa.yasufumi
2018-03-12  5:35   ` ogawa.yasufumi [this message]
2018-03-27 23:51   ` [spp] [PATCH 0/9] Update port management Ferruh Yigit

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=1520832924-28387-10-git-send-email-ogawa.yasufumi@lab.ntt.co.jp \
    --to=ogawa.yasufumi@lab.ntt.co.jp \
    --cc=ferruh.yigit@intel.com \
    --cc=spp@dpdk.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).