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>,
Jason Gunthorpe <jgg@ziepe.ca>, Jan Kara <jack@suse.cz>,
dan.j.williams@intel.com, Jeff Layton <jlayton@kernel.org>,
Ira Weiny <ira.weiny@intel.com>
Subject: [PATCH 04/13] src/locktest: Add get_cmd_str
Date: Tue, 17 Sep 2019 21:15:49 -0700 [thread overview]
Message-ID: <20190918041558.2621-5-ira.weiny@intel.com> (raw)
In-Reply-To: <20190918041558.2621-1-ira.weiny@intel.com>
From: Ira Weiny <ira.weiny@intel.com>
Rather than open code printing the strings, use a helper function.
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-18 4:16 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-18 4:15 [PATCH 00/13] Fix locktest and add lease testing to it ira.weiny
2019-09-18 4:15 ` [PATCH 01/13] src/locktest: Remove unnecessary sleep ira.weiny
2019-09-18 4:15 ` [PATCH 02/13] src/locktest: Remove OPEN macro ira.weiny
2019-09-18 4:15 ` [PATCH 03/13] src/locktest: Change command macro names ira.weiny
2019-09-18 4:15 ` ira.weiny [this message]
2019-09-18 4:15 ` [PATCH 05/13] src/locktest.c: Clean up client command passing ira.weiny
2019-09-18 4:15 ` [PATCH 06/13] src/locktest.c: Fix return code if last test fails ira.weiny
2019-09-18 4:15 ` [PATCH 07/13] generic/131: Clean up pid variables ira.weiny
2019-09-18 4:15 ` [PATCH 08/13] generic/131: Save stderr for debugging ira.weiny
2019-09-18 4:15 ` [PATCH 09/13] src/locktest: Add simple lease testing ira.weiny
2019-09-18 4:15 ` [PATCH 10/13] src/locktest: Add lease testing for basic signal reception ira.weiny
2019-09-18 4:15 ` [PATCH 11/13] src/locktest: Add truncate lease tests ira.weiny
2019-09-18 4:15 ` [PATCH 12/13] src/locktest: Clean up error output ira.weiny
2019-09-18 4:15 ` [PATCH 13/13] src/locktest: Audit all debug output ira.weiny
2019-09-20 13:12 ` [PATCH 00/13] Fix locktest and add lease testing to it Jeff Layton
2019-09-21 16:20 ` Eryu Guan
2019-09-22 2:01 ` Weiny, Ira
2019-09-22 7:52 ` Eryu Guan
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=20190918041558.2621-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 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).