From: Dan Williams <dan.j.williams@intel.com>
To: linux-nvdimm@lists.01.org
Subject: [ndctl PATCH 2/8] ndctl/dimm: Add --human support to read-labels
Date: Tue, 12 Feb 2019 13:28:59 -0800 [thread overview]
Message-ID: <155000693912.348282.3054365378477074974.stgit@dwillia2-desk3.amr.corp.intel.com> (raw)
In-Reply-To: <155000692826.348282.2795434657787204298.stgit@dwillia2-desk3.amr.corp.intel.com>
Allow for easier comparisons between 'read-labels' output and list.
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---
ndctl/dimm.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/ndctl/dimm.c b/ndctl/dimm.c
index 292beebf9734..5ff730f42a45 100644
--- a/ndctl/dimm.c
+++ b/ndctl/dimm.c
@@ -50,6 +50,7 @@ static struct parameters {
bool crypto_erase;
bool overwrite;
bool master_pass;
+ bool human;
bool force;
bool json;
bool verbose;
@@ -79,7 +80,7 @@ static int action_zero(struct ndctl_dimm *dimm, struct action_context *actx)
}
static struct json_object *dump_label_json(struct ndctl_dimm *dimm,
- struct ndctl_cmd *cmd_read, ssize_t size)
+ struct ndctl_cmd *cmd_read, ssize_t size, unsigned long flags)
{
struct json_object *jarray = json_object_new_array();
struct json_object *jlabel = NULL;
@@ -140,12 +141,13 @@ static struct json_object *dump_label_json(struct ndctl_dimm *dimm,
break;
json_object_object_add(jlabel, "nlabel", jobj);
- jobj = json_object_new_int64(le64_to_cpu(nslabel.flags));
+ jobj = util_json_object_hex(le32_to_cpu(nslabel.flags), flags);
if (!jobj)
break;
json_object_object_add(jlabel, "flags", jobj);
- jobj = json_object_new_int64(le64_to_cpu(nslabel.isetcookie));
+ jobj = util_json_object_hex(le64_to_cpu(nslabel.isetcookie),
+ flags);
if (!jobj)
break;
json_object_object_add(jlabel, "isetcookie", jobj);
@@ -155,12 +157,12 @@ static struct json_object *dump_label_json(struct ndctl_dimm *dimm,
break;
json_object_object_add(jlabel, "lbasize", jobj);
- jobj = json_object_new_int64(le64_to_cpu(nslabel.dpa));
+ jobj = util_json_object_hex(le64_to_cpu(nslabel.dpa), flags);
if (!jobj)
break;
json_object_object_add(jlabel, "dpa", jobj);
- jobj = json_object_new_int64(le64_to_cpu(nslabel.rawsize));
+ jobj = util_json_object_size(le64_to_cpu(nslabel.rawsize), flags);
if (!jobj)
break;
json_object_object_add(jlabel, "rawsize", jobj);
@@ -265,6 +267,7 @@ static struct json_object *dump_index_json(struct ndctl_cmd *cmd_read, ssize_t s
static struct json_object *dump_json(struct ndctl_dimm *dimm,
struct ndctl_cmd *cmd_read, ssize_t size)
{
+ unsigned long flags = param.human ? UTIL_JSON_HUMAN : 0;
struct json_object *jdimm = json_object_new_object();
struct json_object *jlabel, *jobj, *jindex;
@@ -273,7 +276,7 @@ static struct json_object *dump_json(struct ndctl_dimm *dimm,
jindex = dump_index_json(cmd_read, size);
if (!jindex)
goto err_jindex;
- jlabel = dump_label_json(dimm, cmd_read, size);
+ jlabel = dump_label_json(dimm, cmd_read, size, flags);
if (!jlabel)
goto err_jlabel;
@@ -1038,7 +1041,8 @@ OPT_BOOLEAN('v',"verbose", ¶m.verbose, "turn on debug")
#define READ_OPTIONS() \
OPT_STRING('o', "output", ¶m.outfile, "output-file", \
"filename to write label area contents"), \
-OPT_BOOLEAN('j', "json", ¶m.json, "parse label data into json")
+OPT_BOOLEAN('j', "json", ¶m.json, "parse label data into json"), \
+OPT_BOOLEAN('u', "human", ¶m.human, "use human friendly number formats ")
#define WRITE_OPTIONS() \
OPT_STRING('i', "input", ¶m.infile, "input-file", \
_______________________________________________
Linux-nvdimm mailing list
Linux-nvdimm@lists.01.org
https://lists.01.org/mailman/listinfo/linux-nvdimm
next prev parent reply other threads:[~2019-02-12 21:41 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-12 21:28 [ndctl PATCH 0/8] Improve support + testing for labels + info-blocks Dan Williams
2019-02-12 21:28 ` [ndctl PATCH 1/8] ndctl/dimm: Add 'flags' field to read-labels output Dan Williams
2019-02-12 21:28 ` Dan Williams [this message]
2019-03-19 22:39 ` [ndctl PATCH 2/8] ndctl/dimm: Add --human support to read-labels Verma, Vishal L
2019-03-19 22:51 ` Dan Williams
2019-02-12 21:29 ` [ndctl PATCH 3/8] ndctl/build: Drop -Wpointer-arith Dan Williams
2019-02-12 21:29 ` [ndctl PATCH 4/8] ndctl/namespace: Add read-info-block command Dan Williams
2019-03-19 23:11 ` Verma, Vishal L
2019-02-12 21:29 ` [ndctl PATCH 5/8] ndctl/test: Update dax-dev to handle multiple e820 ranges Dan Williams
2019-02-12 21:29 ` [ndctl PATCH 6/8] ndctl/test: Make dax.sh more robust vs small namespaces Dan Williams
2019-02-12 21:29 ` [ndctl PATCH 7/8] ndctl/namespace: Always zero info-blocks Dan Williams
2019-02-12 21:29 ` [ndctl PATCH 8/8] ndctl/test: Test inter-region collision handling Dan Williams
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=155000693912.348282.3054365378477074974.stgit@dwillia2-desk3.amr.corp.intel.com \
--to=dan.j.williams@intel.com \
--cc=linux-nvdimm@lists.01.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.