From: "Benjamin Marzinski" <bmarzins@redhat.com>
To: Martin Wilck <mwilck@suse.com>
Cc: dm-devel@redhat.com
Subject: Re: [PATCH v3 22/22] libmultipath: make checker_message thread safe
Date: Thu, 1 Nov 2018 14:53:04 -0500 [thread overview]
Message-ID: <20181101195303.GC29522@octiron.msp.redhat.com> (raw)
In-Reply-To: <20181030210653.29677-23-mwilck@suse.com>
On Tue, Oct 30, 2018 at 10:06:53PM +0100, Martin Wilck wrote:
> Get rid of the static char buffer in checker_message()
> introduced in the previous "replace message by msgid" patch.
What you have is fine, but why not something like this, which doesn't
need to do any allocating?
diff --git a/libmultipath/checkers.c b/libmultipath/checkers.c
index 9d9e3ff..ed75150 100644
--- a/libmultipath/checkers.c
+++ b/libmultipath/checkers.c
@@ -291,7 +291,16 @@ static const char *generic_msg[CHECKER_GENERIC_MSGTABLE_SIZE] = {
[CHECKER_MSGID_UNSUPPORTED] = " doesn't support this device",
};
-static const char *_checker_message(const struct checker *c)
+int checker_has_message(const struct checker *c)
+{
+ const char *msg = checker_message(c);
+
+ if (msg == NULL || *msg == '\0')
+ return 0;
+ return 1;
+}
+
+const char *checker_message(const struct checker *c)
{
int id;
@@ -309,19 +318,6 @@ static const char *_checker_message(const struct checker *c)
return NULL;
}
-char *checker_message(const struct checker *c)
-{
- static char buf[CHECKER_MSG_LEN];
- const char *msg = _checker_message(c);
-
- if (msg == NULL || *msg == '\0')
- *buf = '\0';
- else
- snprintf(buf, sizeof(buf), "%s checker%s",
- c->cls->name, msg);
- return buf;
-}
-
void checker_clear_message (struct checker *c)
{
if (!c)
diff --git a/libmultipath/checkers.h b/libmultipath/checkers.h
index 4e1fdc1..51fd054 100644
--- a/libmultipath/checkers.h
+++ b/libmultipath/checkers.h
@@ -145,7 +145,8 @@ int checker_check (struct checker *, int);
int checker_selected(const struct checker *);
int checker_is_sync(const struct checker *);
const char *checker_name (const struct checker *);
-char *checker_message (const struct checker *);
+const char *checker_message (const struct checker *);
+int checker_has_message(const struct checker *);
void checker_clear_message (struct checker *c);
void checker_get(const char *, struct checker *, const char *);
diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
index 467ece7..a3d8fee 100644
--- a/libmultipath/discovery.c
+++ b/libmultipath/discovery.c
@@ -1588,9 +1588,9 @@ get_state (struct path * pp, struct config *conf, int daemon, int oldstate)
condlog(3, "%s: %s state = %s", pp->dev,
checker_name(c), checker_state_name(state));
if (state != PATH_UP && state != PATH_GHOST &&
- strlen(checker_message(c)))
- condlog(3, "%s: checker msg is \"%s\"",
- pp->dev, checker_message(c));
+ checker_has_message(c))
+ condlog(3, "%s: checker msg is \"%s checker%s\"",
+ pp->dev, checker_name(c), checker_message(c));
return state;
}
diff --git a/multipathd/main.c b/multipathd/main.c
index e80ac90..52d6855 100644
--- a/multipathd/main.c
+++ b/multipathd/main.c
@@ -95,15 +95,11 @@ do { \
if (pp->offline) \
condlog(lvl, "%s: %s - path offline", \
pp->mpp->alias, pp->dev); \
- else { \
- const char *__m = \
- checker_message(&pp->checker); \
- \
- if (strlen(__m)) \
- condlog(lvl, "%s: %s - %s", \
- pp->mpp->alias, \
- pp->dev, __m); \
- } \
+ else if (checker_has_message(&pp->checker)) \
+ condlog(lvl, "%s: %s - %s checker%s", \
+ pp->mpp->alias, pp->dev, \
+ checker_name(&pp->checker), \
+ checker_message(&pp->checker)); \
} \
} while(0)
> Signed-off-by: Martin Wilck <mwilck@suse.com>
> ---
> libmultipath/checkers.c | 23 ++++++++++++++++++-----
> libmultipath/checkers.h | 4 +++-
> libmultipath/discovery.c | 9 ++++++---
> multipathd/main.c | 11 +++++------
> 4 files changed, 32 insertions(+), 15 deletions(-)
>
> diff --git a/libmultipath/checkers.c b/libmultipath/checkers.c
> index 9a19c9a6..f65a9476 100644
> --- a/libmultipath/checkers.c
> +++ b/libmultipath/checkers.c
> @@ -309,16 +309,29 @@ static const char *_checker_message(const struct checker *c)
> return NULL;
> }
>
> +int checker_has_message(const struct checker *c)
> +{
> + const char *msg = _checker_message(c);
> +
> + if (msg == NULL || *msg == '\0')
> + return 0;
> + return 1;
> +}
> +
> char *checker_message(const struct checker *c)
> {
> - static char buf[CHECKER_MSG_LEN];
> + char *buf;
> const char *msg = _checker_message(c);
> + int len;
>
> if (msg == NULL || *msg == '\0')
> - *buf = '\0';
> - else
> - snprintf(buf, sizeof(buf), "%s checker%s",
> - c->cls->name, msg);
> + return NULL;
> +
> + len = CHECKER_NAME_LEN + 8 + CHECKER_MSG_LEN;
> + buf = MALLOC(len);
> + if (buf == NULL)
> + return NULL;
> + snprintf(buf, len, "%s checker%s", c->cls->name, msg);
> return buf;
> }
>
> diff --git a/libmultipath/checkers.h b/libmultipath/checkers.h
> index 834efcfe..2c71e40c 100644
> --- a/libmultipath/checkers.h
> +++ b/libmultipath/checkers.h
> @@ -145,7 +145,9 @@ int checker_check (struct checker *, int);
> int checker_selected(const struct checker *);
> int checker_is_sync(const struct checker *);
> const char *checker_name (const struct checker *);
> -char *checker_message (const struct checker *);
> +/* checker_message(): returned pointer is malloc()d */
> +char *checker_message(const struct checker *);
> +int checker_has_message(const struct checker *);
> void checker_clear_message (struct checker *c);
> void checker_get(const char *, struct checker *, const char *);
>
> diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
> index 467ece7a..0bcd3c39 100644
> --- a/libmultipath/discovery.c
> +++ b/libmultipath/discovery.c
> @@ -1588,9 +1588,12 @@ get_state (struct path * pp, struct config *conf, int daemon, int oldstate)
> condlog(3, "%s: %s state = %s", pp->dev,
> checker_name(c), checker_state_name(state));
> if (state != PATH_UP && state != PATH_GHOST &&
> - strlen(checker_message(c)))
> - condlog(3, "%s: checker msg is \"%s\"",
> - pp->dev, checker_message(c));
> + checker_has_message(c)) {
> + char *msg = checker_message(c);
> +
> + condlog(3, "%s: checker msg is \"%s\"", pp->dev, msg);
> + FREE(msg);
> + }
> return state;
> }
>
> diff --git a/multipathd/main.c b/multipathd/main.c
> index e80ac906..fcf0d2db 100644
> --- a/multipathd/main.c
> +++ b/multipathd/main.c
> @@ -95,14 +95,13 @@ do { \
> if (pp->offline) \
> condlog(lvl, "%s: %s - path offline", \
> pp->mpp->alias, pp->dev); \
> - else { \
> - const char *__m = \
> + else if (checker_has_message(&pp->checker)) { \
> + char *__m = \
> checker_message(&pp->checker); \
> \
> - if (strlen(__m)) \
> - condlog(lvl, "%s: %s - %s", \
> - pp->mpp->alias, \
> - pp->dev, __m); \
> + condlog(lvl, "%s: %s - %s", \
> + pp->mpp->alias, pp->dev, __m); \
> + FREE(__m); \
> } \
> } \
> } while(0)
> --
> 2.19.1
next prev parent reply other threads:[~2018-11-01 19:53 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-30 21:06 [PATCH v3 00/22] libmultipath: checkers overhaul Martin Wilck
2018-10-30 21:06 ` [PATCH v3 01/22] libmultipath: fix use of uninitialized memory in write() Martin Wilck
2018-10-30 21:06 ` [PATCH v3 02/22] libmultipath: fix memory leaks from scandir() use Martin Wilck
2018-10-30 21:06 ` [PATCH v3 03/22] libmultipath/checkers: replace message by msgid Martin Wilck
2018-10-30 21:06 ` [PATCH v3 04/22] libmultipath/checkers: cciss_tur: use message id Martin Wilck
2018-10-30 21:06 ` [PATCH v3 05/22] libmultipath/checkers: directio: " Martin Wilck
2018-10-30 21:06 ` [PATCH v3 06/22] libmultipath/checkers: emc_clariion: " Martin Wilck
2018-10-30 21:06 ` [PATCH v3 07/22] libmultipath/checkers: hp_sw: " Martin Wilck
2018-10-30 21:06 ` [PATCH v3 08/22] libmultipath/checkers: rdac: " Martin Wilck
2018-10-30 21:06 ` [PATCH v3 09/22] libmultipath/checkers: readsector0: " Martin Wilck
2018-10-30 21:06 ` [PATCH v3 10/22] libmultipath/checkers: tur: " Martin Wilck
2018-10-30 21:06 ` [PATCH v3 11/22] multipathd: improve checker message logging Martin Wilck
2018-10-30 21:06 ` [PATCH v3 12/22] libmultipath/checkers: support unsupported paths Martin Wilck
2018-10-30 21:06 ` [PATCH v3 13/22] libmultipath: clariion checker: leave unsupported paths alone Martin Wilck
2018-11-01 19:49 ` Benjamin Marzinski
2018-10-30 21:06 ` [PATCH v3 14/22] libmultipath: hp_sw " Martin Wilck
2018-10-30 21:06 ` [PATCH v3 15/22] libmultipath: rdac " Martin Wilck
2018-10-30 21:06 ` [PATCH v3 16/22] libmultipath: tur " Martin Wilck
2018-10-30 21:06 ` [PATCH v3 17/22] libmultipath: pathinfo: don't blank wwid if checker fails Martin Wilck
2018-10-30 21:06 ` [PATCH v3 18/22] multipathd: check_path: improve logging for "unusable path" case Martin Wilck
2018-10-30 21:06 ` [PATCH v3 19/22] libmultipath: coalesce_paths: improve logging of orphaned paths Martin Wilck
2018-10-30 21:06 ` [PATCH v3 20/22] libmultipath: sync_map_state: log failing paths Martin Wilck
2018-10-30 21:06 ` [PATCH v3 21/22] libmultipath/checkers: cleanup class/instance model Martin Wilck
2018-10-30 21:06 ` [PATCH v3 22/22] libmultipath: make checker_message thread safe Martin Wilck
2018-11-01 19:53 ` Benjamin Marzinski [this message]
2018-11-02 8:50 ` Martin Wilck
2018-10-30 21:10 ` [PATCH v3 00/22] libmultipath: checkers overhaul Martin Wilck
2018-10-30 21:12 ` Martin Wilck
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=20181101195303.GC29522@octiron.msp.redhat.com \
--to=bmarzins@redhat.com \
--cc=dm-devel@redhat.com \
--cc=mwilck@suse.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 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.