From db107907923b9c5ca434de7d35c8ea4387884488 Mon Sep 17 00:00:00 2001 From: Arshad Hussain Date: Sun, 29 Sep 2019 21:53:41 +0530 Subject: [PATCH] LU-6142 tests: Fix style issues for unlinkmany.c This patch fixes issues reported by checkpatch for file lustre/tests/unlinkmany.c This patch also updates the usage message to to print the information about '-d' option. Test-Parameters: trivial Signed-off-by: Arshad Hussain Change-Id: Idd107ba7c005e0186bc39fc9bb4fc84691919178 Reviewed-on: https://review.whamcloud.com/36389 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Petros Koutoupis Reviewed-by: Ben Evans Reviewed-by: Shaun Tancheff Reviewed-by: James Simmons Reviewed-by: Oleg Drokin --- lustre/tests/unlinkmany.c | 80 +++++++++++++++++++++++++---------------------- 1 file changed, 43 insertions(+), 37 deletions(-) diff --git a/lustre/tests/unlinkmany.c b/lustre/tests/unlinkmany.c index 3cce72b..f83ba57 100644 --- a/lustre/tests/unlinkmany.c +++ b/lustre/tests/unlinkmany.c @@ -40,22 +40,27 @@ void usage(char *prog) { - printf("usage: %s filenamefmt count\n", prog); - printf(" %s filenamefmt start count\n", prog); + printf("usage: %s [option] filenamefmt count\n", prog); + printf(" %s [option] filenamefmt start count\n", prog); + printf("Options are:\n"); + printf(" -d : remove directory\n"); + printf("Examples:\n"); + printf("unlinkmany $DIR/dir 100 # Remove file dir0..dir99\n"); + printf("unlinkmany -d $DIR/dir 100 # Remove directory dir0..dir99\n"); } -int main(int argc, char ** argv) +int main(int argc, char **argv) { - int i, rc = 0, do_rmdir = 0; - char format[4096], *fmt; - char filename[4096]; - long start, last; + int i, rc = 0, do_rmdir = 0; + char format[4096], *fmt; + char filename[4096]; + long start, last; long begin = 0, count; - if (argc < 3 || argc > 5) { + if (argc < 3 || argc > 5) { usage(argv[0]); - return 1; - } + return 1; + } if (strcmp(argv[1], "-d") == 0) { do_rmdir = 1; @@ -63,19 +68,20 @@ int main(int argc, char ** argv) argc--; } - if (strlen(argv[1]) > 4080) { - printf("name too long\n"); - return 1; - } + if (strlen(argv[1]) > 4080) { + printf("name too long\n"); + return 1; + } - start = last = time(0); + start = time(0); + last = start; if (argc == 3) { count = strtol(argv[2], NULL, 0); if (count < 1) { - printf("count must be at least one\n"); - return 1; - } + printf("count must be at least one\n"); + return 1; + } } else { begin = strtol(argv[2], NULL, 0); count = strtol(argv[3], NULL, 0); @@ -83,32 +89,32 @@ int main(int argc, char ** argv) if (strchr(argv[1], '%')) { fmt = argv[1]; - } else { + } else { sprintf(format, "%s%%d", argv[1]); fmt = format; } - for (i = 0; i < count; i++, begin++) { - sprintf(filename, fmt, begin); + + for (i = 0; i < count; i++, begin++) { + sprintf(filename, fmt, begin); if (do_rmdir) rc = rmdir(filename); else rc = unlink(filename); - if (rc) { - printf("%s(%s) error: %s\n", + if (rc) { + printf("%s(%s) error: %s\n", do_rmdir ? "rmdir" : "unlink", - filename, strerror(errno)); - rc = errno; - break; - } - if ((i % 10000) == 0) { - printf(" - unlinked %d (time %ld ; total %ld ; last " - "%ld)\n", i, time(0), time(0) - start, - time(0) - last); - last = time(0); - } - } - printf("total: %d unlinks in %ld seconds: %f unlinks/second\n", i, - time(0) - start, ((float)i / (time(0) - start))); + filename, strerror(errno)); + rc = errno; + break; + } + if ((i % 10000) == 0) { + printf(" - unlinked %d (time %ld ; total %ld ; last %ld)\n", + i, time(0), time(0) - start, time(0) - last); + last = time(0); + } + } + printf("total: %d unlinks in %ld seconds: %f unlinks/second\n", i, + time(0) - start, ((float)i / (time(0) - start))); - return rc; + return rc; } -- 1.8.3.1