* [PATCH 2/3] nfs.conf tidy ups
@ 2017-05-22 15:50 Justin Mitchell
2017-06-01 14:45 ` Steve Dickson
2017-06-06 14:37 ` Steve Dickson
0 siblings, 2 replies; 4+ messages in thread
From: Justin Mitchell @ 2017-05-22 15:50 UTC (permalink / raw)
To: linux-nfs@vger.kernel.org
Add function to cleanup and free the loaded config
Signed-off-by: Justin Mitchell <jumitche@rehat.com>
---
support/include/conffile.h | 1 +
support/nfs/conffile.c | 51 +++++++++++++++++++++++++++++++++++++++-------
2 files changed, 45 insertions(+), 7 deletions(-)
diff --git a/support/include/conffile.h b/support/include/conffile.h
index 20b1a32..2d11a52 100644
--- a/support/include/conffile.h
+++ b/support/include/conffile.h
@@ -60,6 +60,7 @@ extern _Bool conf_get_bool(char *, char *, _Bool);
extern char *conf_get_str(char *, char *);
extern char *conf_get_section(char *, char *, char *);
extern void conf_init(const char *);
+extern void conf_cleanup(void);
extern int conf_match_num(char *, char *, int);
extern int conf_remove(int, char *, char *);
extern int conf_remove_section(int, char *);
diff --git a/support/nfs/conffile.c b/support/nfs/conffile.c
index a76c7e3..7c607c0 100644
--- a/support/nfs/conffile.c
+++ b/support/nfs/conffile.c
@@ -414,13 +414,32 @@ conf_load(int trans, const char *path)
return -1;
}
+/* remove and free up any existing config state */
+static void conf_free_bindings(void)
+{
+ unsigned int i;
+ for (i = 0; i < sizeof conf_bindings / sizeof conf_bindings[0]; i++) {
+ struct conf_binding *cb, *next;
+
+ cb = LIST_FIRST(&conf_bindings[i]);
+ for (; cb; cb = next) {
+ next = LIST_NEXT(cb, link);
+ LIST_REMOVE(cb, link);
+ free(cb->section);
+ free(cb->arg);
+ free(cb->tag);
+ free(cb->value);
+ free(cb);
+ }
+ LIST_INIT(&conf_bindings[i]);
+ }
+}
+
/* Open the config file and map it into our address space, then parse it. */
static void
conf_reinit(const char *conf_file)
{
- struct conf_binding *cb = 0;
int trans;
- unsigned int i;
trans = conf_begin();
if (conf_load(trans, conf_file) < 0)
@@ -430,12 +449,9 @@ conf_reinit(const char *conf_file)
conf_load_defaults();
/* Free potential existing configuration. */
- for (i = 0; i < sizeof conf_bindings / sizeof conf_bindings[0]; i++) {
- cb = LIST_FIRST (&conf_bindings[i]);
- for (; cb; cb = LIST_FIRST (&conf_bindings[i]))
- conf_remove_now(cb->section, cb->tag);
- }
+ conf_free_bindings();
+ /* Apply the new configuration values */
conf_end(trans, 1);
return;
}
@@ -454,6 +470,27 @@ conf_init (const char *conf_file)
conf_reinit(conf_file);
}
+/*
+ * Empty the config and free up any used memory
+ */
+void
+conf_cleanup(void)
+{
+ conf_free_bindings();
+
+ struct conf_trans *node, *next;
+ for (node = TAILQ_FIRST(&conf_trans_queue); node; node = next) {
+ next = TAILQ_NEXT(node, link);
+ TAILQ_REMOVE (&conf_trans_queue, node, link);
+ if (node->section) free(node->section);
+ if (node->arg) free(node->arg);
+ if (node->tag) free(node->tag);
+ if (node->value) free(node->value);
+ free (node);
+ }
+ TAILQ_INIT(&conf_trans_queue);
+}
+
/*
* Return the numeric value denoted by TAG in section SECTION or DEF
* if that tag does not exist.
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 2/3] nfs.conf tidy ups
2017-05-22 15:50 [PATCH 2/3] nfs.conf tidy ups Justin Mitchell
@ 2017-06-01 14:45 ` Steve Dickson
2017-06-02 9:05 ` Justin Mitchell
2017-06-06 14:37 ` Steve Dickson
1 sibling, 1 reply; 4+ messages in thread
From: Steve Dickson @ 2017-06-01 14:45 UTC (permalink / raw)
To: Justin Mitchell, linux-nfs@vger.kernel.org
Hello,
On 05/22/2017 11:50 AM, Justin Mitchell wrote:
> Add function to cleanup and free the loaded config
>
> Signed-off-by: Justin Mitchell <jumitche@rehat.com>
>
> ---
> support/include/conffile.h | 1 +
> support/nfs/conffile.c | 51 +++++++++++++++++++++++++++++++++++++++-------
> 2 files changed, 45 insertions(+), 7 deletions(-)
>
> diff --git a/support/include/conffile.h b/support/include/conffile.h
> index 20b1a32..2d11a52 100644
> --- a/support/include/conffile.h
> +++ b/support/include/conffile.h
> @@ -60,6 +60,7 @@ extern _Bool conf_get_bool(char *, char *, _Bool);
> extern char *conf_get_str(char *, char *);
> extern char *conf_get_section(char *, char *, char *);
> extern void conf_init(const char *);
> +extern void conf_cleanup(void);
I don't see this being called any where? How is it being used?
steved.
> extern int conf_match_num(char *, char *, int);
> extern int conf_remove(int, char *, char *);
> extern int conf_remove_section(int, char *);
> diff --git a/support/nfs/conffile.c b/support/nfs/conffile.c
> index a76c7e3..7c607c0 100644
> --- a/support/nfs/conffile.c
> +++ b/support/nfs/conffile.c
> @@ -414,13 +414,32 @@ conf_load(int trans, const char *path)
> return -1;
> }
>
> +/* remove and free up any existing config state */
> +static void conf_free_bindings(void)
> +{
> + unsigned int i;
> + for (i = 0; i < sizeof conf_bindings / sizeof conf_bindings[0]; i++) {
> + struct conf_binding *cb, *next;
> +
> + cb = LIST_FIRST(&conf_bindings[i]);
> + for (; cb; cb = next) {
> + next = LIST_NEXT(cb, link);
> + LIST_REMOVE(cb, link);
> + free(cb->section);
> + free(cb->arg);
> + free(cb->tag);
> + free(cb->value);
> + free(cb);
> + }
> + LIST_INIT(&conf_bindings[i]);
> + }
> +}
> +
> /* Open the config file and map it into our address space, then parse it. */
> static void
> conf_reinit(const char *conf_file)
> {
> - struct conf_binding *cb = 0;
> int trans;
> - unsigned int i;
>
> trans = conf_begin();
> if (conf_load(trans, conf_file) < 0)
> @@ -430,12 +449,9 @@ conf_reinit(const char *conf_file)
> conf_load_defaults();
>
> /* Free potential existing configuration. */
> - for (i = 0; i < sizeof conf_bindings / sizeof conf_bindings[0]; i++) {
> - cb = LIST_FIRST (&conf_bindings[i]);
> - for (; cb; cb = LIST_FIRST (&conf_bindings[i]))
> - conf_remove_now(cb->section, cb->tag);
> - }
> + conf_free_bindings();
>
> + /* Apply the new configuration values */
> conf_end(trans, 1);
> return;
> }
> @@ -454,6 +470,27 @@ conf_init (const char *conf_file)
> conf_reinit(conf_file);
> }
>
> +/*
> + * Empty the config and free up any used memory
> + */
> +void
> +conf_cleanup(void)
> +{
> + conf_free_bindings();
> +
> + struct conf_trans *node, *next;
> + for (node = TAILQ_FIRST(&conf_trans_queue); node; node = next) {
> + next = TAILQ_NEXT(node, link);
> + TAILQ_REMOVE (&conf_trans_queue, node, link);
> + if (node->section) free(node->section);
> + if (node->arg) free(node->arg);
> + if (node->tag) free(node->tag);
> + if (node->value) free(node->value);
> + free (node);
> + }
> + TAILQ_INIT(&conf_trans_queue);
> +}
> +
> /*
> * Return the numeric value denoted by TAG in section SECTION or DEF
> * if that tag does not exist.
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 2/3] nfs.conf tidy ups
2017-06-01 14:45 ` Steve Dickson
@ 2017-06-02 9:05 ` Justin Mitchell
0 siblings, 0 replies; 4+ messages in thread
From: Justin Mitchell @ 2017-06-02 9:05 UTC (permalink / raw)
To: Steve Dickson; +Cc: linux-nfs@vger.kernel.org
On Thu, 2017-06-01 at 10:45 -0400, Steve Dickson wrote:
> Hello,
>
> On 05/22/2017 11:50 AM, Justin Mitchell wrote:
> > Add function to cleanup and free the loaded config
> >
> > Signed-off-by: Justin Mitchell <jumitche@rehat.com>
> >
> > ---
> > support/include/conffile.h | 1 +
> > support/nfs/conffile.c | 51 +++++++++++++++++++++++++++++++++++++++-------
> > 2 files changed, 45 insertions(+), 7 deletions(-)
> >
> > diff --git a/support/include/conffile.h b/support/include/conffile.h
> > index 20b1a32..2d11a52 100644
> > --- a/support/include/conffile.h
> > +++ b/support/include/conffile.h
> > @@ -60,6 +60,7 @@ extern _Bool conf_get_bool(char *, char *, _Bool);
> > extern char *conf_get_str(char *, char *);
> > extern char *conf_get_section(char *, char *, char *);
> > extern void conf_init(const char *);
> > +extern void conf_cleanup(void);
> I don't see this being called any where? How is it being used?
>
> steved.
It is not directly referenced yet, for completeness all of the programs
that use the conf file should call it as part of their shutdown, but of
course thats not vital when your process is exiting anyway.
it will however be more important for a library using the same code, and
for anything that is going to re-load its config or handle multiple
files.
It also gets used in my memory leak testing.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/3] nfs.conf tidy ups
2017-05-22 15:50 [PATCH 2/3] nfs.conf tidy ups Justin Mitchell
2017-06-01 14:45 ` Steve Dickson
@ 2017-06-06 14:37 ` Steve Dickson
1 sibling, 0 replies; 4+ messages in thread
From: Steve Dickson @ 2017-06-06 14:37 UTC (permalink / raw)
To: Justin Mitchell, linux-nfs@vger.kernel.org
On 05/22/2017 11:50 AM, Justin Mitchell wrote:
> Add function to cleanup and free the loaded config
>
> Signed-off-by: Justin Mitchell <jumitche@rehat.com>
Committed...
steved.
>
> ---
> support/include/conffile.h | 1 +
> support/nfs/conffile.c | 51 +++++++++++++++++++++++++++++++++++++++-------
> 2 files changed, 45 insertions(+), 7 deletions(-)
>
> diff --git a/support/include/conffile.h b/support/include/conffile.h
> index 20b1a32..2d11a52 100644
> --- a/support/include/conffile.h
> +++ b/support/include/conffile.h
> @@ -60,6 +60,7 @@ extern _Bool conf_get_bool(char *, char *, _Bool);
> extern char *conf_get_str(char *, char *);
> extern char *conf_get_section(char *, char *, char *);
> extern void conf_init(const char *);
> +extern void conf_cleanup(void);
> extern int conf_match_num(char *, char *, int);
> extern int conf_remove(int, char *, char *);
> extern int conf_remove_section(int, char *);
> diff --git a/support/nfs/conffile.c b/support/nfs/conffile.c
> index a76c7e3..7c607c0 100644
> --- a/support/nfs/conffile.c
> +++ b/support/nfs/conffile.c
> @@ -414,13 +414,32 @@ conf_load(int trans, const char *path)
> return -1;
> }
>
> +/* remove and free up any existing config state */
> +static void conf_free_bindings(void)
> +{
> + unsigned int i;
> + for (i = 0; i < sizeof conf_bindings / sizeof conf_bindings[0]; i++) {
> + struct conf_binding *cb, *next;
> +
> + cb = LIST_FIRST(&conf_bindings[i]);
> + for (; cb; cb = next) {
> + next = LIST_NEXT(cb, link);
> + LIST_REMOVE(cb, link);
> + free(cb->section);
> + free(cb->arg);
> + free(cb->tag);
> + free(cb->value);
> + free(cb);
> + }
> + LIST_INIT(&conf_bindings[i]);
> + }
> +}
> +
> /* Open the config file and map it into our address space, then parse it. */
> static void
> conf_reinit(const char *conf_file)
> {
> - struct conf_binding *cb = 0;
> int trans;
> - unsigned int i;
>
> trans = conf_begin();
> if (conf_load(trans, conf_file) < 0)
> @@ -430,12 +449,9 @@ conf_reinit(const char *conf_file)
> conf_load_defaults();
>
> /* Free potential existing configuration. */
> - for (i = 0; i < sizeof conf_bindings / sizeof conf_bindings[0]; i++) {
> - cb = LIST_FIRST (&conf_bindings[i]);
> - for (; cb; cb = LIST_FIRST (&conf_bindings[i]))
> - conf_remove_now(cb->section, cb->tag);
> - }
> + conf_free_bindings();
>
> + /* Apply the new configuration values */
> conf_end(trans, 1);
> return;
> }
> @@ -454,6 +470,27 @@ conf_init (const char *conf_file)
> conf_reinit(conf_file);
> }
>
> +/*
> + * Empty the config and free up any used memory
> + */
> +void
> +conf_cleanup(void)
> +{
> + conf_free_bindings();
> +
> + struct conf_trans *node, *next;
> + for (node = TAILQ_FIRST(&conf_trans_queue); node; node = next) {
> + next = TAILQ_NEXT(node, link);
> + TAILQ_REMOVE (&conf_trans_queue, node, link);
> + if (node->section) free(node->section);
> + if (node->arg) free(node->arg);
> + if (node->tag) free(node->tag);
> + if (node->value) free(node->value);
> + free (node);
> + }
> + TAILQ_INIT(&conf_trans_queue);
> +}
> +
> /*
> * Return the numeric value denoted by TAG in section SECTION or DEF
> * if that tag does not exist.
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-06-06 14:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-22 15:50 [PATCH 2/3] nfs.conf tidy ups Justin Mitchell
2017-06-01 14:45 ` Steve Dickson
2017-06-02 9:05 ` Justin Mitchell
2017-06-06 14:37 ` Steve Dickson
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).