From 75c4a071fb1d6a136c84b26c1f2b0773e22474e2 Mon Sep 17 00:00:00 2001 From: Arshad Hussain Date: Mon, 8 Jul 2019 08:43:24 +0530 Subject: [PATCH] LU-6142 tests: Fix style issues for lp_utils.c This patch fixes issues reported by checkpatch for file lustre/tests/mpi/lp_utils.c Test-Parameters: trivial Signed-off-by: Arshad Hussain Change-Id: I6595161378936c4cb5f6229ca1f37617d0dc657c Reviewed-on: https://review.whamcloud.com/35492 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: James Simmons --- lustre/tests/mpi/lp_utils.c | 350 ++++++++++++++++++++++---------------------- 1 file changed, 177 insertions(+), 173 deletions(-) diff --git a/lustre/tests/mpi/lp_utils.c b/lustre/tests/mpi/lp_utils.c index 4a68beb..b64d207 100644 --- a/lustre/tests/mpi/lp_utils.c +++ b/lustre/tests/mpi/lp_utils.c @@ -48,102 +48,106 @@ #define MAX_PROCESSES 8 -int verbose = 0; -int debug = 0; +int verbose; +int debug; char hostname[1024]; struct timeval t1, t2; -char *timestamp() { - static char datestring[80]; - time_t timestamp; +char *timestamp() +{ + static char datestring[80]; + time_t timestamp; - fflush(stdout); - timestamp = time(NULL); - strftime(datestring, 80, "%T", localtime(×tamp)); + fflush(stdout); + timestamp = time(NULL); + strftime(datestring, 80, "%T", localtime(×tamp)); - return datestring; + return datestring; } -void begin(char *str) { - if (verbose > 0 && rank == 0) { - gettimeofday(&t1, NULL); - printf("%s:\tBeginning %s\n", timestamp(), str); - fflush(stdout); - } +void begin(char *str) +{ + if (verbose > 0 && rank == 0) { + gettimeofday(&t1, NULL); + printf("%s:\tBeginning %s\n", timestamp(), str); + fflush(stdout); + } } -void end(char *str) { - float elapsed; - - MPI_Barrier(MPI_COMM_WORLD); - if (verbose > 0 && rank == 0) { - gettimeofday(&t2, NULL); +void end(char *str) +{ + float elapsed; - elapsed = t2.tv_sec - t1.tv_sec + - (float)(t2.tv_usec-t1.tv_usec)/1000000; - if (elapsed >= 60) { - printf("%s:\tFinished %-15s(%.2f min)\n", - timestamp(), str, elapsed / 60); - } else { - printf("%s:\tFinished %-15s(%.3f sec)\n", - timestamp(), str, elapsed); + MPI_Barrier(MPI_COMM_WORLD); + if (verbose > 0 && rank == 0) { + gettimeofday(&t2, NULL); - } - fflush(stdout); - } + elapsed = t2.tv_sec - t1.tv_sec + + (float)(t2.tv_usec - t1.tv_usec) / 1000000; + if (elapsed >= 60) { + printf("%s:\tFinished %-15s(%.2f min)\n", + timestamp(), str, elapsed / 60); + } else { + printf("%s:\tFinished %-15s(%.3f sec)\n", + timestamp(), str, elapsed); + } + fflush(stdout); + } } void dump_diff(char *orig_buf, char *buf, int size, long _off) { - int i, diff, off; - char *p, *end; + int i, diff, off; + char *p, *end; - printf("commpared buf size %d, at offset %lu\n\n", size, _off); + printf("commpared buf size %d, at offset %lu\n\n", size, _off); - if (orig_buf) { - printf("original buf:\n"); - p = orig_buf; - end = orig_buf + size; - i = 1; - while (p < end) { - printf(" %8lx", *(long *)p); - p += sizeof(long); - if (i++%8 == 0) - printf("\n"); - } - if (i%8) printf("\n\n"); - else printf("\n"); - } + if (orig_buf) { + printf("original buf:\n"); + p = orig_buf; + end = orig_buf + size; + i = 1; + while (p < end) { + printf(" %8lx", *(long *)p); + p += sizeof(long); + if (i++ % 8 == 0) + printf("\n"); + } + if (i % 8) + printf("\n\n"); + else + printf("\n"); + } - if (buf) { - printf("different data: diff_data(orig_data)\n"); - diff = 0; - off = 0; - i = 1; - p = buf; - end = buf + size; - while (p < end) { - if (memcmp(p, orig_buf + off, sizeof(long)) != 0) { - printf("\toff: %5d,\tdata: %8lx (%8lx)\n", off, - *(unsigned long *)p, - *(unsigned long *)(orig_buf + off)); - diff++; - } - off += sizeof(long); - p += sizeof(long); - } - printf("\n %d total differents found\n\n", diff); - } + if (buf) { + printf("different data: diff_data(orig_data)\n"); + diff = 0; + off = 0; + i = 1; + p = buf; + end = buf + size; + while (p < end) { + if (memcmp(p, orig_buf + off, sizeof(long)) != 0) { + printf("\toff: %5d,\tdata: %8lx (%8lx)\n", off, + *(unsigned long *)p, + *(unsigned long *)(orig_buf + off)); + diff++; + } + off += sizeof(long); + p += sizeof(long); + } + printf("\n %d total differents found\n\n", diff); + } } void lp_gethostname(void) { - if (gethostname(hostname, 1024) == -1) { - fprintf(stderr, "gethostname: (%d)%s", errno, strerror(errno)); - MPI_Abort(MPI_COMM_WORLD, 2); - } + if (gethostname(hostname, 1024) == -1) { + fprintf(stderr, "gethostname: (%d)%s", errno, strerror(errno)); + MPI_Abort(MPI_COMM_WORLD, 2); + } } /* This function does not FAIL if the requested "name" does not exit. @@ -152,127 +156,127 @@ void lp_gethostname(void) */ void remove_file_or_dir(char *name) { - struct stat statbuf; - char errmsg[MAX_FILENAME_LEN + 20]; + struct stat statbuf; + char errmsg[MAX_FILENAME_LEN + 20]; - if (stat(name, &statbuf) != -1) { - if (S_ISREG(statbuf.st_mode)) { - printf("stale file found\n"); - if (unlink(name) == -1) { - sprintf(errmsg, "unlink of %s", name); - FAIL(errmsg); - } - } - if (S_ISDIR(statbuf.st_mode)) { - printf("stale directory found\n"); - if (rmdir(name) == -1) { - sprintf(errmsg, "rmdir of %s", name); - FAIL(errmsg); - } - } - } + if (stat(name, &statbuf) != -1) { + if (S_ISREG(statbuf.st_mode)) { + printf("stale file found\n"); + if (unlink(name) == -1) { + sprintf(errmsg, "unlink of %s", name); + FAIL(errmsg); + } + } + if (S_ISDIR(statbuf.st_mode)) { + printf("stale directory found\n"); + if (rmdir(name) == -1) { + sprintf(errmsg, "rmdir of %s", name); + FAIL(errmsg); + } + } + } } void create_file(char *name, long filesize, int fill) { - static char filename[MAX_FILENAME_LEN]; - char errmsg[MAX_FILENAME_LEN + 20]; - char buf[1024 * 8]; - char c = 'A' + size; - int fd, rc; - short zero = 0; - long left = filesize; + static char filename[MAX_FILENAME_LEN]; + char errmsg[MAX_FILENAME_LEN + 20]; + char buf[1024 * 8]; + char c = 'A' + size; + int fd, rc; + short zero = 0; + long left = filesize; - /* Process 0 creates the test file(s) */ - if (rank == 0) { - sprintf(filename, "%s/%s", testdir, name); - remove_file_or_dir(filename); - if ((fd = creat(filename, FILEMODE)) == -1) { - sprintf(errmsg, "create of file %s", filename); - FAIL(errmsg); - } - if (filesize > 0) { - if (lseek(fd, filesize - 1, SEEK_SET) == -1) { - close(fd); - sprintf(errmsg, "lseek of file %s", filename); - FAIL(errmsg); - } - if (write(fd, &zero, 1) == -1) { - close(fd); - sprintf(errmsg, "write of file %s", filename); - FAIL(errmsg); - } - } - if (filesize > 0 && fill) { - if (lseek(fd, 0, SEEK_SET) == -1) { - close(fd); - sprintf(errmsg, "lseek of file %s", filename); - FAIL(errmsg); - } - memset(buf, c, 1024); - while (left > 0) { - if ((rc = write(fd, buf, - left > (1024 * 8) ? (1024 * 8) : left)) - == -1) { - close(fd); - sprintf(errmsg, "write of file %s", filename); - FAIL(errmsg); - } - left -= rc; - } - } - if (close(fd) == -1) { - sprintf(errmsg, "close of file %s", filename); - FAIL(errmsg); - } - } + /* Process 0 creates the test file(s) */ + if (rank == 0) { + sprintf(filename, "%s/%s", testdir, name); + remove_file_or_dir(filename); + if ((fd = creat(filename, FILEMODE)) == -1) { + sprintf(errmsg, "create of file %s", filename); + FAIL(errmsg); + } + if (filesize > 0) { + if (lseek(fd, filesize - 1, SEEK_SET) == -1) { + close(fd); + sprintf(errmsg, "lseek of file %s", filename); + FAIL(errmsg); + } + if (write(fd, &zero, 1) == -1) { + close(fd); + sprintf(errmsg, "write of file %s", filename); + FAIL(errmsg); + } + } + if (filesize > 0 && fill) { + if (lseek(fd, 0, SEEK_SET) == -1) { + close(fd); + sprintf(errmsg, "lseek of file %s", filename); + FAIL(errmsg); + } + memset(buf, c, 1024); + while (left > 0) { + if ((rc = write(fd, buf, + left > (1024 * 8) ? (1024 * 8) : left)) == -1) { + close(fd); + sprintf(errmsg, "write of file %s", + filename); + FAIL(errmsg); + } + left -= rc; + } + } + if (close(fd) == -1) { + sprintf(errmsg, "close of file %s", filename); + FAIL(errmsg); + } + } } void check_stat(char *filename, struct stat *state, struct stat *old_state) { - char errmsg[MAX_FILENAME_LEN+20]; + char errmsg[MAX_FILENAME_LEN + 20]; - if (stat(filename, state) == -1) { - sprintf(errmsg, "stat of file %s", filename); - FAIL(errmsg); - } + if (stat(filename, state) == -1) { + sprintf(errmsg, "stat of file %s", filename); + FAIL(errmsg); + } - if (memcmp(state, old_state, sizeof(struct stat)) != 0) { - errno = 0; - sprintf(errmsg, LP_STAT_FMT, LP_STAT_ARGS); - FAIL(errmsg); - } + if (memcmp(state, old_state, sizeof(struct stat)) != 0) { + errno = 0; + sprintf(errmsg, LP_STAT_FMT, LP_STAT_ARGS); + FAIL(errmsg); + } } void remove_file(char *name) { - char filename[MAX_FILENAME_LEN]; - char errmsg[MAX_FILENAME_LEN + 20]; + char filename[MAX_FILENAME_LEN]; + char errmsg[MAX_FILENAME_LEN + 20]; - /* Process 0 remove the file(s) */ - if (rank == 0) { - sprintf(filename, "%s/%s", testdir, name); - if (unlink(filename) == -1) { - sprintf(errmsg, "unlink of file %s", filename); - FAIL(errmsg); - } - } + /* Process 0 remove the file(s) */ + if (rank == 0) { + sprintf(filename, "%s/%s", testdir, name); + if (unlink(filename) == -1) { + sprintf(errmsg, "unlink of file %s", filename); + FAIL(errmsg); + } + } } void fill_stride(char *buf, int buf_size, long long rank, long long _off) { - char *p = buf; - long long off, data[2]; - int cp, left = buf_size; + char *p = buf; + long long off, data[2]; + int cp, left = buf_size; - data[0] = rank; - off = _off; - while (left > 0) { - data[1] = off; - cp = left > sizeof(data) ? sizeof(data) : left; - memcpy(p, data, cp); - off += cp; - p += cp; - left -= cp; - } + data[0] = rank; + off = _off; + while (left > 0) { + data[1] = off; + cp = left > sizeof(data) ? sizeof(data) : left; + memcpy(p, data, cp); + off += cp; + p += cp; + left -= cp; + } } -- 1.8.3.1