From: ira.weiny@intel.com
To: fstests@vger.kernel.org, Eryu Guan <guaneryu@gmail.com>
Cc: john.hubbard@gmail.com, Dave Chinner <david@fromorbit.com>,
Jan Kara <jack@suse.cz>, Jason Gunthorpe <jgg@ziepe.ca>,
dan.j.williams@intel.com, Jeff Layton <jlayton@kernel.org>,
Ira Weiny <ira.weiny@intel.com>
Subject: [PATCH V2 04/16] src/locktest: Add get_cmd_str
Date: Mon, 23 Sep 2019 10:53:24 -0700 [thread overview]
Message-ID: <20190923175336.2287-5-ira.weiny@intel.com> (raw)
In-Reply-To: <20190923175336.2287-1-ira.weiny@intel.com>
From: Ira Weiny <ira.weiny@intel.com>
Rather than open code printing the strings, use a helper function.
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
---
src/locktest.c | 30 ++++++++++++++++++------------
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/src/locktest.c b/src/locktest.c
index ce04ecba6205..825d9df3ddf8 100644
--- a/src/locktest.c
+++ b/src/locktest.c
@@ -109,6 +109,19 @@ static HANDLE f_fd = INVALID_HANDLE; /* shared file */
#define WHO 5
#define FLAGS 2 /* index 2 is also used for do_open() flag, see below */
+static char *get_cmd_str(int cmd)
+{
+ switch (cmd) {
+ case CMD_WRLOCK: return "write lock"; break;
+ case CMD_RDLOCK: return "read lock"; break;
+ case CMD_UNLOCK: return "unlock"; break;
+ case CMD_CLOSE: return "close"; break;
+ case CMD_OPEN: return "open"; break;
+ case CMD_WRTEST: return "Wait for SIGIO"; break;
+ case CMD_RDTEST: return "Truncate"; break;
+ }
+ return "unknown";
+}
/*
* flags for Mac OS X do_open()
* O_RDONLY 0x0000
@@ -989,10 +1002,8 @@ main(int argc, char *argv[])
/* We have a failure */
if(debug)
fprintf(stderr, "Server failure in test %d, while %sing using offset %lld, length %lld - err = %d:%s\n",
- ctl.test, tests[index][COMMAND]==CMD_WRLOCK?"write lock":
- tests[index][COMMAND]==CMD_RDLOCK?"read lock":
- tests[index][COMMAND]==CMD_UNLOCK?"unlock":
- tests[index][COMMAND]==CMD_OPEN?"open":"clos",
+ ctl.test,
+ get_cmd_str(tests[index][COMMAND]),
(long long)tests[index][OFFSET],
(long long)tests[index][LENGTH],
saved_errno, strerror(saved_errno));
@@ -1009,10 +1020,8 @@ main(int argc, char *argv[])
}
if(debug > 1)
fprintf(stderr, "Sending command to client (%d) - %s - %lld:%lld\n",
- index, tests[index][COMMAND]==CMD_WRLOCK?"write lock":
- tests[index][COMMAND]==CMD_RDLOCK?"read lock":
- tests[index][COMMAND]==CMD_UNLOCK?"unlock":
- tests[index][COMMAND]==CMD_OPEN?"open":"clos",
+ index,
+ get_cmd_str(ctl.command),
(long long)tests[index][OFFSET],
(long long)tests[index][LENGTH]);
/* get the client to do something */
@@ -1027,10 +1036,7 @@ main(int argc, char *argv[])
fail_flag++;
if(debug)
fprintf(stderr, "Client failure in test %d, while %sing using offset %lld, length %lld - err = %d:%s\n",
- ctl.test, ctl.command==CMD_WRLOCK?"write lock":
- ctl.command==CMD_RDLOCK?"read lock":
- ctl.command==CMD_UNLOCK?"unlock":
- ctl.command==CMD_OPEN?"open":"clos",
+ ctl.test, get_cmd_str(ctl.command),
(long long)ctl.offset, (long long)ctl.length,
ctl.error, strerror(ctl.error));
fprintf(stderr, "Client failure in %lld:%s\n",
--
2.20.1
next prev parent reply other threads:[~2019-09-23 17:53 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-23 17:53 [PATCH V2 00/16] Fix locktest and add lease testing to it ira.weiny
2019-09-23 17:53 ` [PATCH V2 01/16] src/locktest: Remove unnecessary sleep ira.weiny
2019-09-23 17:53 ` [PATCH V2 02/16] src/locktest: Remove OPEN macro ira.weiny
2019-09-23 17:53 ` [PATCH V2 03/16] src/locktest: Change command macro names ira.weiny
2019-09-23 17:53 ` ira.weiny [this message]
2019-09-23 17:53 ` [PATCH V2 05/16] src/locktest.c: Clean up client command passing ira.weiny
2019-09-23 17:53 ` [PATCH V2 06/16] src/locktest.c: Fix return code if last test fails ira.weiny
2019-09-23 17:53 ` [PATCH V2 07/16] generic/131: Clean up pid variables ira.weiny
2019-09-23 17:53 ` [PATCH V2 08/16] generic/131: Save stderr for debugging ira.weiny
2019-09-23 17:53 ` [PATCH V2 09/16] src/locktest: Clean up error output ira.weiny
2019-09-23 17:53 ` [PATCH V2 10/16] src/locktest: Audit all debug output ira.weiny
2019-09-23 17:53 ` [PATCH V2 11/16] src/locktest: Add run() function ira.weiny
2019-09-23 17:53 ` [PATCH V2 12/16] src/locktest: Add simple lease testing ira.weiny
2019-09-23 17:53 ` [PATCH V2 13/16] src/locktest: Add lease testing for basic signal reception ira.weiny
2019-09-23 17:53 ` [PATCH V2 14/16] src/locktest: Add truncate lease tests ira.weiny
2019-09-23 17:59 ` [PATCH V2 15/16] common/locktest: Add common locktest functions ira.weiny
2019-09-23 17:59 ` [PATCH V2 16/16] generic/568: Add lease testing ira.weiny
2019-10-01 21:54 ` [PATCH V2 00/16] Fix locktest and add lease testing to it Ira Weiny
2019-10-02 8:24 ` Eryu Guan
2019-10-02 17:59 ` Ira Weiny
-- strict thread matches above, loose matches on Subject: below --
2019-09-23 17:51 ira.weiny
2019-09-23 17:51 ` [PATCH V2 04/16] src/locktest: Add get_cmd_str ira.weiny
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=20190923175336.2287-5-ira.weiny@intel.com \
--to=ira.weiny@intel.com \
--cc=dan.j.williams@intel.com \
--cc=david@fromorbit.com \
--cc=fstests@vger.kernel.org \
--cc=guaneryu@gmail.com \
--cc=jack@suse.cz \
--cc=jgg@ziepe.ca \
--cc=jlayton@kernel.org \
--cc=john.hubbard@gmail.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.