nvdimm.lists.linux.dev archive mirror
 help / color / mirror / Atom feed
From: "qi.fuli@fujitsu.com" <qi.fuli@fujitsu.com>
To: 'Vishal Verma' <vishal.l.verma@intel.com>,
	"nvdimm@lists.linux.dev" <nvdimm@lists.linux.dev>
Cc: Dan Williams <dan.j.williams@intel.com>,
	"fenghua.hu@intel.com" <fenghua.hu@intel.com>
Subject: RE: [ndctl PATCH 3/7] util/parse-config: refactor filter_conf_files into util/
Date: Thu, 2 Sep 2021 12:17:25 +0000	[thread overview]
Message-ID: <TYCPR01MB6461717B39B9FDEDE9EFE55AF7CE9@TYCPR01MB6461.jpnprd01.prod.outlook.com> (raw)
In-Reply-To: <20210831090459.2306727-4-vishal.l.verma@intel.com>

> Subject: [ndctl PATCH 3/7] util/parse-config: refactor filter_conf_files into util/
> 
> Move filter_conf() into util/parse-configs.c as filter_conf_files() so that it can be
> reused by the config parser in daxctl.
> 
> Cc: QI Fuli <qi.fuli@fujitsu.com>
> Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
> ---
>  ndctl/lib/libndctl.c   | 19 ++-----------------
>  util/parse-configs.h   |  4 ++++
>  util/parse-configs.c   | 16 ++++++++++++++++
>  daxctl/lib/Makefile.am |  2 ++
>  ndctl/lib/Makefile.am  |  2 ++
>  5 files changed, 26 insertions(+), 17 deletions(-)
> 
> diff --git a/ndctl/lib/libndctl.c b/ndctl/lib/libndctl.c index db2e38b..a01ac80
> 100644
> --- a/ndctl/lib/libndctl.c
> +++ b/ndctl/lib/libndctl.c
> @@ -25,6 +25,7 @@
>  #include <util/size.h>
>  #include <util/sysfs.h>
>  #include <util/strbuf.h>
> +#include <util/parse-configs.h>
>  #include <ndctl/libndctl.h>
>  #include <ndctl/namespace.h>
>  #include <daxctl/libdaxctl.h>
> @@ -266,22 +267,6 @@ NDCTL_EXPORT void ndctl_set_userdata(struct
> ndctl_ctx *ctx, void *userdata)
>  	ctx->userdata = userdata;
>  }
> 
> -static int filter_conf(const struct dirent *dir) -{
> -	if (!dir)
> -		return 0;
> -
> -	if (dir->d_type == DT_REG) {
> -		const char *ext = strrchr(dir->d_name, '.');
> -		if ((!ext) || (ext == dir->d_name))
> -			return 0;
> -		if (strcmp(ext, ".conf") == 0)
> -			return 1;
> -	}
> -
> -	return 0;
> -}
> -
>  NDCTL_EXPORT void ndctl_set_configs(struct ndctl_ctx **ctx, char *conf_dir)
> {
>  	struct dirent **namelist;
> @@ -291,7 +276,7 @@ NDCTL_EXPORT void ndctl_set_configs(struct ndctl_ctx
> **ctx, char *conf_dir)
>  	if ((!ctx) || (!conf_dir))
>  		return;
> 
> -	rc = scandir(conf_dir, &namelist, filter_conf, alphasort);
> +	rc = scandir(conf_dir, &namelist, filter_conf_files, alphasort);
>  	if (rc == -1) {
>  		perror("scandir");
>  		return;
> diff --git a/util/parse-configs.h b/util/parse-configs.h index f70f58f..491aebb
> 100644
> --- a/util/parse-configs.h
> +++ b/util/parse-configs.h
> @@ -1,8 +1,10 @@
>  // SPDX-License-Identifier: GPL-2.0
>  // Copyright (C) 2021, FUJITSU LIMITED. ALL rights reserved.
> 
> +#include <dirent.h>
>  #include <stdbool.h>
>  #include <stdint.h>
> +#include <string.h>
>  #include <util/util.h>
> 
>  enum parse_conf_type {
> @@ -11,6 +13,8 @@ enum parse_conf_type {
>  	MONITOR_CALLBACK,
>  };
> 
> +int filter_conf_files(const struct dirent *dir);
> +
>  struct config;
>  typedef int parse_conf_cb(const struct config *, const char *config_file);
> 
> diff --git a/util/parse-configs.c b/util/parse-configs.c index 44dcff4..72c4913
> 100644
> --- a/util/parse-configs.c
> +++ b/util/parse-configs.c
> @@ -6,6 +6,22 @@
>  #include <util/strbuf.h>
>  #include <util/iniparser.h>
> 
> +int filter_conf_files(const struct dirent *dir) {
> +	if (!dir)
> +		return 0;
> +
> +	if (dir->d_type == DT_REG) {
> +		const char *ext = strrchr(dir->d_name, '.');
> +		if ((!ext) || (ext == dir->d_name))
> +			return 0;
> +		if (strcmp(ext, ".conf") == 0)
> +			return 1;
> +	}
> +
> +	return 0;
> +}
> +
>  static void set_str_val(const char **value, const char *val)  {
>  	struct strbuf buf = STRBUF_INIT;
> diff --git a/daxctl/lib/Makefile.am b/daxctl/lib/Makefile.am index
> 25efd83..db2351e 100644
> --- a/daxctl/lib/Makefile.am
> +++ b/daxctl/lib/Makefile.am
> @@ -15,6 +15,8 @@ libdaxctl_la_SOURCES =\
>  	../../util/sysfs.h \
>  	../../util/log.c \
>  	../../util/log.h \
> +	../../util/parse-configs.h \
> +	../../util/parse-configs.c \
>  	libdaxctl.c
> 
>  libdaxctl_la_LIBADD =\
> diff --git a/ndctl/lib/Makefile.am b/ndctl/lib/Makefile.am index
> f741c44..8020eb4 100644
> --- a/ndctl/lib/Makefile.am
> +++ b/ndctl/lib/Makefile.am
> @@ -19,6 +19,8 @@ libndctl_la_SOURCES =\
>  	../../util/wrapper.c \
>  	../../util/usage.c \
>  	../../util/fletcher.h \
> +	../../util/parse-configs.h \
> +	../../util/parse-configs.c \
>  	dimm.c \
>  	inject.c \
>  	nfit.c \
> --
> 2.31.1

Looks good to me.
Thank you very much.

QI

  reply	other threads:[~2021-09-02 12:18 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-31  9:04 [ndctl PATCH 0/7] Policy based reconfiguration for daxctl Vishal Verma
2021-08-31  9:04 ` [ndctl PATCH 1/7] ndctl: Update ndctl.spec.in for 'ndctl.conf' Vishal Verma
2021-09-02 12:15   ` qi.fuli
2021-08-31  9:04 ` [ndctl PATCH 2/7] daxctl: Documentation updates for persistent reconfiguration Vishal Verma
2021-09-16 22:47   ` Dan Williams
2021-11-17 23:02     ` Verma, Vishal L
2021-08-31  9:04 ` [ndctl PATCH 3/7] util/parse-config: refactor filter_conf_files into util/ Vishal Verma
2021-09-02 12:17   ` qi.fuli [this message]
2021-09-16 22:54   ` Dan Williams
2021-08-31  9:04 ` [ndctl PATCH 4/7] daxctl: add basic config parsing support Vishal Verma
2021-09-02 12:19   ` qi.fuli
2021-09-16 22:58   ` Dan Williams
2021-11-17 23:17     ` Verma, Vishal L
2021-08-31  9:04 ` [ndctl PATCH 5/7] util/parse-configs: add a key/value search helper Vishal Verma
2021-09-02 13:12   ` qi.fuli
2021-09-16 23:54   ` Dan Williams
2021-11-17 23:21     ` Verma, Vishal L
2021-08-31  9:04 ` [ndctl PATCH 6/7] daxctl/device.c: add an option for getting params from a config file Vishal Verma
2021-09-17  1:59   ` Dan Williams
2021-11-17 23:45     ` Verma, Vishal L
2021-08-31  9:04 ` [ndctl PATCH 7/7] daxctl: add systemd service and udev rule for auto-onlining Vishal Verma
2021-09-03  0:56   ` qi.fuli
2021-09-17 18:10   ` Dan Williams
2021-11-17 23:29     ` Verma, Vishal L
2021-11-17 23:43       ` Dan Williams
2021-11-18  2:40     ` Verma, Vishal L
2021-11-18  3:40       ` Dan Williams
2021-09-16 22:12 ` [ndctl PATCH 0/7] Policy based reconfiguration for daxctl Dan Williams
2021-11-19 20:57   ` Verma, Vishal L

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=TYCPR01MB6461717B39B9FDEDE9EFE55AF7CE9@TYCPR01MB6461.jpnprd01.prod.outlook.com \
    --to=qi.fuli@fujitsu.com \
    --cc=dan.j.williams@intel.com \
    --cc=fenghua.hu@intel.com \
    --cc=nvdimm@lists.linux.dev \
    --cc=vishal.l.verma@intel.com \
    /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).