From patchwork Fri Feb 9 08:02:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: QI Fuli X-Patchwork-Id: 10208389 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 B227B60245 for ; Fri, 9 Feb 2018 08:02:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A6E612978B for ; Fri, 9 Feb 2018 08:02:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9BAED29797; Fri, 9 Feb 2018 08:02:47 +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=-1.9 required=2.0 tests=BAYES_00, 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 499EA2978B for ; Fri, 9 Feb 2018 08:02:47 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 15767222DE158; Thu, 8 Feb 2018 23:57:01 -0800 (PST) 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=202.219.69.168; helo=mgwkm01.jp.fujitsu.com; envelope-from=qi.fuli@jp.fujitsu.com; receiver=linux-nvdimm@lists.01.org Received: from mgwkm01.jp.fujitsu.com (mgwkm01.jp.fujitsu.com [202.219.69.168]) (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 307EB223DB78C for ; Thu, 8 Feb 2018 23:56:56 -0800 (PST) Received: from kw-mxq.gw.nic.fujitsu.com (unknown [192.168.231.130]) by mgwkm01.jp.fujitsu.com with smtp id 50f4_1987_412c03a0_866f_48a6_a78f_437e8a64426c; Fri, 09 Feb 2018 17:02:38 +0900 Received: from m3050.s.css.fujitsu.com (msm.b.css.fujitsu.com [10.134.21.208]) by kw-mxq.gw.nic.fujitsu.com (Postfix) with ESMTP id 31B48AC017B for ; Fri, 9 Feb 2018 17:02:38 +0900 (JST) Received: from qi-fedora.fujitsu.com (unknown [10.124.196.110]) by m3050.s.css.fujitsu.com (Postfix) with ESMTP id 1192C235; Fri, 9 Feb 2018 17:02:38 +0900 (JST) From: QI Fuli To: linux-nvdimm@lists.01.org Subject: [RFC PATCH v3 4/5] ndctl: monitor: add ndclt show-monitor command Date: Fri, 9 Feb 2018 17:02:24 +0900 Message-Id: <20180209080225.5137-5-qi.fuli@jp.fujitsu.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20180209080225.5137-1-qi.fuli@jp.fujitsu.com> References: <20180209080225.5137-1-qi.fuli@jp.fujitsu.com> X-TM-AS-MML: disable X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.23 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 This patch is used to add $ndctl show-monitor command, by which users can check the specific of a monitor. Example: $ndctl show-monitor --monitor m_nmem1 Signed-off-by: QI Fuli --- builtin.h | 1 + ndctl/monitor.c | 35 +++++++++++++++++++++++++++++++++++ ndctl/ndctl.c | 1 + 3 files changed, 37 insertions(+) diff --git a/builtin.h b/builtin.h index eda5c7a..b5a006d 100644 --- a/builtin.h +++ b/builtin.h @@ -38,6 +38,7 @@ int cmd_check_labels(int argc, const char **argv, void *ctx); int cmd_inject_error(int argc, const char **argv, void *ctx); int cmd_create_monitor(int argc, const char **argv, void *ctx); int cmd_list_monitor(int argc, const char **argv, void *ctx); +int cmd_show_monitor(int argc, const char **argv, void *ctx); int cmd_list(int argc, const char **argv, void *ctx); #ifdef ENABLE_TEST int cmd_test(int argc, const char **argv, void *ctx); diff --git a/ndctl/monitor.c b/ndctl/monitor.c index 53b7c67..1cff2d8 100644 --- a/ndctl/monitor.c +++ b/ndctl/monitor.c @@ -372,3 +372,38 @@ int cmd_list_monitor(int argc, const char **argv, void *ctx) out: return 1; } + +int cmd_show_monitor(int argc, const char **argv, void *ctx) +{ + const struct option options[] = { + OPT_STRING('m', "monitor", ¶m.monitor, "monitor name", + "monitor name") + }; + const char * const u[] = { + "ndctl show-monitor ", + NULL + }; + argc = parse_options(argc, argv, options, u, 0); + for (int i = 0; i < argc; i++) { + error("unknown parameter \"%s\"\n", argv[i]); + goto out; + } + if (!param.monitor) { + error("monitor name --monitor is required\n"); + goto out; + } + + char *filename; + filename = get_full_path_filename(proc_path, param.monitor); + struct json_object *jmonitors = json_object_from_file(filename); + if (jmonitors == NULL) { + error("monitor %s is not exist\n", param.monitor); + goto out; + } + + printf("%s\n", json_object_to_json_string_ext(jmonitors, + JSON_C_TO_STRING_PRETTY)); + return 0; +out: + return 1; +} diff --git a/ndctl/ndctl.c b/ndctl/ndctl.c index 7eae794..460cf76 100644 --- a/ndctl/ndctl.c +++ b/ndctl/ndctl.c @@ -86,6 +86,7 @@ static struct cmd_struct commands[] = { { "inject-error", cmd_inject_error }, { "create-monitor", cmd_create_monitor }, { "list-monitor", cmd_list_monitor }, + { "show-monitor", cmd_show_monitor }, { "list", cmd_list }, { "help", cmd_help }, #ifdef ENABLE_TEST