From patchwork Tue Jun 26 20:46:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 10490201 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3F3D560532 for ; Tue, 26 Jun 2018 20:43:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 318C628405 for ; Tue, 26 Jun 2018 20:43:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 264042860C; Tue, 26 Jun 2018 20:43:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AE7A628405 for ; Tue, 26 Jun 2018 20:43:27 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 3FAFF202E5303; Tue, 26 Jun 2018 13:43:27 -0700 (PDT) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.115; helo=mga14.intel.com; envelope-from=keith.busch@intel.com; receiver=linux-nvdimm@lists.01.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id A8E91211F8864 for ; Tue, 26 Jun 2018 13:43:26 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Jun 2018 13:43:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,275,1526367600"; d="scan'208";a="50124393" Received: from unknown (HELO localhost.lm.intel.com) ([10.232.112.44]) by fmsmga007.fm.intel.com with ESMTP; 26 Jun 2018 13:43:25 -0700 From: Keith Busch To: linux-nvdimm@lists.01.org, Dan Williams , Vishal Verma Subject: [ndctl PATCH 1/2] ndctl: Add 'list' verbose options Date: Tue, 26 Jun 2018 14:46:48 -0600 Message-Id: <20180626204649.7665-1-keith.busch@intel.com> X-Mailer: git-send-email 2.13.6 X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP The informational and miscellaneous flag options are becoming more numerous, and can be difficult to remember what can be listed. Rather than add more flags to suppress and show some of the less pertinent information, this patch adds a 'verbose' option that increases the detail of information displayed. The verbose option can be repeated multiple times to increase the detail. There are currently three levels of verbose, and repeating more than that has the same behavior as level three. Signed-off-by: Keith Busch --- ndctl/list.c | 25 ++++++++++++++++++++++++- util/json.c | 33 +++++++++++++++++++-------------- util/json.h | 1 + 3 files changed, 44 insertions(+), 15 deletions(-) diff --git a/ndctl/list.c b/ndctl/list.c index 6cf7c39..98e5b3d 100644 --- a/ndctl/list.c +++ b/ndctl/list.c @@ -36,6 +36,7 @@ static struct { bool media_errors; bool human; bool firmware; + int verbose; } list; static unsigned long listopts_to_flags(void) @@ -50,6 +51,8 @@ static unsigned long listopts_to_flags(void) flags |= UTIL_JSON_DAX | UTIL_JSON_DAX_DEVS; if (list.human) flags |= UTIL_JSON_HUMAN; + if (list.verbose) + flags |= UTIL_JSON_VERBOSE; return flags; } @@ -112,7 +115,7 @@ static struct json_object *region_to_json(struct ndctl_region *region, numa = ndctl_region_get_numa_node(region); if (numa >= 0) { jobj = json_object_new_int(numa); - if (jobj) + if (jobj && flags & UTIL_JSON_VERBOSE) json_object_object_add(jregion, "numa_node", jobj); } @@ -444,6 +447,8 @@ int cmd_list(int argc, const char **argv, void *ctx) "include media errors"), OPT_BOOLEAN('u', "human", &list.human, "use human friendly number formats "), + OPT_INCR('v', "verbose", &list.verbose, + "increase output detail"), OPT_END(), }; const char * const u[] = { @@ -468,6 +473,24 @@ int cmd_list(int argc, const char **argv, void *ctx) param.mode = "dax"; } + switch (list.verbose) { + default: + case 3: + list.idle = true; + list.firmware = true; + case 2: + list.buses = true; + list.regions = true; + case 1: + list.dimms = true; + list.health = true; + list.media_errors = true; + list.namespaces = true; + list.dax = true; + case 0: + break; + } + if (num_list_flags() == 0) list.namespaces = true; diff --git a/util/json.c b/util/json.c index 1772177..a9f028b 100644 --- a/util/json.c +++ b/util/json.c @@ -660,6 +660,21 @@ static struct json_object *util_raw_uuid(struct ndctl_namespace *ndns) return json_object_new_string(buf); } +static void util_raw_uuid_to_json(struct ndctl_namespace *ndns, + unsigned long flags, + struct json_object *jndns) +{ + struct json_object *jobj; + + if (!(flags & UTIL_JSON_VERBOSE)) + return; + + jobj = util_raw_uuid(ndns); + if (!jobj) + return; + json_object_object_add(jndns, "raw_uuid", jobj); +} + struct json_object *util_namespace_to_json(struct ndctl_namespace *ndns, unsigned long flags) { @@ -732,11 +747,7 @@ struct json_object *util_namespace_to_json(struct ndctl_namespace *ndns, if (!jobj) goto err; json_object_object_add(jndns, "uuid", jobj); - - jobj = util_raw_uuid(ndns); - if (!jobj) - goto err; - json_object_object_add(jndns, "raw_uuid", jobj); + util_raw_uuid_to_json(ndns, flags, jndns); bdev = ndctl_btt_get_block_device(btt); } else if (pfn) { ndctl_pfn_get_uuid(pfn, uuid); @@ -745,10 +756,7 @@ struct json_object *util_namespace_to_json(struct ndctl_namespace *ndns, if (!jobj) goto err; json_object_object_add(jndns, "uuid", jobj); - jobj = util_raw_uuid(ndns); - if (!jobj) - goto err; - json_object_object_add(jndns, "raw_uuid", jobj); + util_raw_uuid_to_json(ndns, flags, jndns); bdev = ndctl_pfn_get_block_device(pfn); } else if (dax) { struct daxctl_region *dax_region; @@ -760,10 +768,7 @@ struct json_object *util_namespace_to_json(struct ndctl_namespace *ndns, if (!jobj) goto err; json_object_object_add(jndns, "uuid", jobj); - jobj = util_raw_uuid(ndns); - if (!jobj) - goto err; - json_object_object_add(jndns, "raw_uuid", jobj); + util_raw_uuid_to_json(ndns, flags, jndns); if ((flags & UTIL_JSON_DAX) && dax_region) { jobj = util_daxctl_region_to_json(dax_region, NULL, flags); @@ -810,7 +815,7 @@ struct json_object *util_namespace_to_json(struct ndctl_namespace *ndns, * happens because they use pre-v1.2 labels or because they * don't have a label space (devtype=nd_namespace_io). */ - if (sector_size < UINT_MAX) { + if (sector_size < UINT_MAX && flags & UTIL_JSON_VERBOSE) { jobj = json_object_new_int(sector_size); if (!jobj) goto err; diff --git a/util/json.h b/util/json.h index c5d1603..17e9320 100644 --- a/util/json.h +++ b/util/json.h @@ -23,6 +23,7 @@ enum util_json_flags { UTIL_JSON_DAX = (1 << 2), UTIL_JSON_DAX_DEVS = (1 << 3), UTIL_JSON_HUMAN = (1 << 4), + UTIL_JSON_VERBOSE = (1 << 5), }; struct json_object;