Netdev List
 help / color / mirror / Atom feed
From: Aya Levin <ayal@mellanox.com>
To: David Ahern <dsahern@gmail.com>
Cc: netdev@vger.kernel.org, Jiri Pirko <jiri@mellanox.com>,
	Moshe Shemesh <moshe@mellanox.com>,
	Eran Ben Elisha <eranbe@mellanox.com>,
	Aya Levin <ayal@mellanox.com>
Subject: [PATCH v4 iproute2-next 04/11] devlink: Add helper functions for name and value separately
Date: Thu, 28 Feb 2019 14:12:57 +0200	[thread overview]
Message-ID: <1551355984-15752-5-git-send-email-ayal@mellanox.com> (raw)
In-Reply-To: <1551355984-15752-1-git-send-email-ayal@mellanox.com>

Add a new helper functions which outputs only values (without name
label) for different types: boolean, uint, uint64, string and binary.
In addition add a helper function which prints only the name label.

Signed-off-by: Aya Levin <ayal@mellanox.com>
Reviewed-by: Moshe Shemesh <moshe@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
---
 devlink/devlink.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/devlink/devlink.c b/devlink/devlink.c
index 4b7e8ec2c88a..c3f874564309 100644
--- a/devlink/devlink.c
+++ b/devlink/devlink.c
@@ -1661,6 +1661,71 @@ static void pr_out_u64(struct dl *dl, const char *name, uint64_t val)
 	}
 }
 
+static void pr_out_bool_value(struct dl *dl, bool value)
+{
+	if (dl->json_output)
+		jsonw_bool(dl->jw, value);
+	else
+		pr_out(" %s", value ? "true" : "false");
+}
+
+static void pr_out_uint_value(struct dl *dl, unsigned int value)
+{
+	if (dl->json_output)
+		jsonw_uint(dl->jw, value);
+	else
+		pr_out(" %u", value);
+}
+
+static void pr_out_uint64_value(struct dl *dl, uint64_t value)
+{
+	if (dl->json_output)
+		jsonw_u64(dl->jw, value);
+	else
+		pr_out(" %lu", value);
+}
+
+static void pr_out_binary_value(struct dl *dl, uint8_t *data, uint32_t len)
+{
+	int i = 1;
+
+	if (dl->json_output)
+		jsonw_start_array(dl->jw);
+	else
+		pr_out("\n");
+
+	while (i < len) {
+		if (dl->json_output) {
+			jsonw_printf(dl->jw, "%d", data[i]);
+		} else {
+			pr_out(" %02x", data[i]);
+			if (!(i % 16))
+				pr_out("\n");
+		}
+		i++;
+	}
+	if (dl->json_output)
+		jsonw_end_array(dl->jw);
+	else if ((i - 1) % 16)
+		pr_out("\n");
+}
+
+static void pr_out_str_value(struct dl *dl, const char *value)
+{
+	if (dl->json_output)
+		jsonw_string(dl->jw, value);
+	else
+		pr_out(" %s", value);
+}
+
+static void pr_out_name(struct dl *dl, const char *name)
+{
+	if (dl->json_output)
+		jsonw_name(dl->jw, name);
+	else
+		pr_out(" %s:", name);
+}
+
 static void pr_out_region_chunk_start(struct dl *dl, uint64_t addr)
 {
 	if (dl->json_output) {
-- 
2.14.1


  parent reply	other threads:[~2019-02-28 12:13 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-28 12:12 [PATCH v4 iproute2-next 00/11] Add support for devlink health Aya Levin
2019-02-28 12:12 ` [PATCH v4 iproute2-next 01/11] devlink: Refactor validation of finding required arguments Aya Levin
2019-02-28 12:12 ` [PATCH v4 iproute2-next 02/11] devlink: Fix print of uint64_t Aya Levin
2019-02-28 12:12 ` [PATCH v4 iproute2-next 03/11] devlink: Fix boolean JSON print Aya Levin
2019-02-28 12:12 ` Aya Levin [this message]
2019-02-28 12:12 ` [PATCH v4 iproute2-next 05/11] devlink: Add devlink health show command Aya Levin
2019-02-28 12:12 ` [PATCH v4 iproute2-next 06/11] devlink: Add devlink health recover command Aya Levin
2019-02-28 12:13 ` [PATCH v4 iproute2-next 07/11] devlink: Add devlink health diagnose command Aya Levin
2019-02-28 12:13 ` [PATCH v4 iproute2-next 08/11] devlink: Add devlink health dump show command Aya Levin
2019-02-28 12:13 ` [PATCH v4 iproute2-next 09/11] devlink: Add devlink health dump clear command Aya Levin
2019-02-28 12:13 ` [PATCH v4 iproute2-next 10/11] devlink: Add devlink health set command Aya Levin
2019-02-28 12:13 ` [PATCH v4 iproute2-next 11/11] devlink: Add devlink-health man page Aya Levin
2019-02-28 16:01 ` [PATCH v4 iproute2-next 00/11] Add support for devlink health David Ahern

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=1551355984-15752-5-git-send-email-ayal@mellanox.com \
    --to=ayal@mellanox.com \
    --cc=dsahern@gmail.com \
    --cc=eranbe@mellanox.com \
    --cc=jiri@mellanox.com \
    --cc=moshe@mellanox.com \
    --cc=netdev@vger.kernel.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