Whamcloud - gitweb
LU-6142 tests: Fix style issues for cascading_rw.c 33/35433/3
authorArshad Hussain <arshad.super@gmail.com>
Fri, 5 Jul 2019 20:56:26 +0000 (02:26 +0530)
committerOleg Drokin <green@whamcloud.com>
Wed, 17 Jul 2019 06:21:29 +0000 (06:21 +0000)
This patch fixes issues reported by checkpatch
for file lustre/tests/mpi/cascading_rw.c

Test-Parameters: trivial
Signed-off-by: Arshad Hussain <arshad.super@gmail.com>
Change-Id: I033db1a7ee23042cc3ec0dedced48830e00d1230
Reviewed-on: https://review.whamcloud.com/35433
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
lustre/tests/mpi/cascading_rw.c

index 0858939..359b947 100644 (file)
@@ -68,321 +68,326 @@ void rw_file(char *name, long stride, unsigned int seed)
        long off;
        long page_size = sysconf(_SC_PAGESIZE);
 
-        sprintf(filename, "%s/%s", testdir, name);
-
-        if (rank == 0) {
-                remove_file_or_dir(filename);
-
-                lum.lmm_magic = LOV_USER_MAGIC;
-                lum.lmm_stripe_size = 0;
-                lum.lmm_stripe_count = 0;
-                lum.lmm_stripe_offset = -1;
-
-                fd = open(filename, O_CREAT | O_RDWR | O_LOV_DELAY_CREATE,
-                          FILEMODE);
-                if (fd == -1) {
-                        sprintf(errmsg, "open of file %s", filename);
-                        FAIL(errmsg);
-                }
-
-                rc = ioctl(fd, LL_IOC_LOV_SETSTRIPE, &lum);
-                if (rc == -1) {
-                        sprintf(errmsg, "ioctl SETSTRIPE of file %s", filename);
-                        FAIL(errmsg);
-                }
-
-                if (close(fd) == -1) {
-                        sprintf(errmsg, "close of file %s", filename);
-                        FAIL(errmsg);
-                }
-        }
-
-        MPI_Barrier(MPI_COMM_WORLD);
-
-        if (stride < 0) {
-                if (rank == 0) {
-                        srandom(seed);
-                        while (stride < page_size/2) {
-                                stride = random();
-                                stride -= stride % 16;
-                                if (stride < 0)
-                                        stride = -stride;
-                                stride %= 2 * lum.lmm_stripe_size;
-                        }
-                }
-
-                MPI_Barrier(MPI_COMM_WORLD);
-
-                MPI_Bcast(&stride, 1, MPI_LONG, root, MPI_COMM_WORLD);
-        }
-
-        MPI_Barrier(MPI_COMM_WORLD);
-
-        buf = (char *)malloc(stride);
-        if (buf == NULL) {
-                sprintf(errmsg, "malloc of buf with size %ld", stride);
-                FAIL(errmsg);
-        }
-
-        if (rank == 0) {
-                fd = open(filename, O_RDWR);
-                if (fd == -1) {
-                        sprintf(errmsg, "open of file %s", filename);
-                        FAIL(errmsg);
-                }
-
-                off = 0;
-                fill_stride(buf, stride, 0, off);
-                rc = write(fd, buf, stride);
-                if (rc != stride) {
-                        sprintf(errmsg, "write of file %s return %d",
-                                filename, rc);
-                        FAIL(errmsg);
-                }
-                off += stride;
-
-                while (off < size * stride) {
-                        fill_stride(buf, stride, 0x8080808080808080ULL, off);
-                        rc = write(fd, buf, stride);
-                        if (rc != stride) {
-                                sprintf(errmsg, "write of file %s return %d",
-                                        filename, rc);
-                                FAIL(errmsg);
-                        }
-
-                        off += stride;
-                }
-
-                if (close(fd) == -1) {
-                        sprintf(errmsg, "close of file %s", filename);
-                        FAIL(errmsg);
-                }
-        }
-
-        MPI_Barrier(MPI_COMM_WORLD);
-
-        o_buf = (char *)malloc(stride);
-        if (o_buf == NULL) {
-                sprintf(errmsg, "malloc of o_buf with size %ld", stride);
-                FAIL(errmsg);
-        }
-
-        fd = open(filename, O_RDWR);
-        if (fd == -1) {
-                sprintf(errmsg, "open of file %s", filename);
-                FAIL(errmsg);
-        }
-
-        off = 0;
-        for (i = 1; i < size; ++i) {
-                if (rank == i) {
-                        rc = lseek(fd, off, SEEK_SET);
-                        if (rc != off) {
-                                sprintf(errmsg, "lseek of file %s return %d",
-                                        filename, rc);
-                                FAIL(errmsg);
-                        }
-
-                        rc = read(fd, buf, stride);
-                        if (rc != stride) {
-                                if (rc > 0) {
-                                        fill_stride(o_buf, rc, i - 1, off);
-                                        dump_diff(o_buf, buf, rc, off);
-                                }
-                                sprintf(errmsg, "read of file %s return %d",
-                                        filename, rc);
-                                FAIL(errmsg);
-                        }
-
-                        fill_stride(o_buf, stride, i - 1, off);
-                        if (memcmp(o_buf, buf, stride) != 0) {
-                                dump_diff(o_buf, buf, stride, off);
-                                errno = 0;
-                                sprintf(errmsg, "Error: diff data read from %s",
-                                        filename);
-                                FAIL(errmsg);
-                        }
-                }
-
-                off += stride;
-
-                if (rank == i) {
-                        fill_stride(buf, stride, i, off);
-                        rc = write(fd, buf, stride);
-                        if (rc != stride) {
-                                sprintf(errmsg, "write of file %s return %d",
-                                        filename, rc);
-                                FAIL(errmsg);
-                        }
-                }
-
-                MPI_Barrier(MPI_COMM_WORLD);
-        }
-
-        if (close(fd) == -1) {
-                sprintf(errmsg, "close of file %s", filename);
-                FAIL(errmsg);
-        }
-
-        MPI_Barrier(MPI_COMM_WORLD);
-
-        if (rank == 0) {
-                fd = open(filename, O_RDONLY);
-                if (fd == -1) {
-                        sprintf(errmsg, "open of file %s", filename);
-                        FAIL(errmsg);
-                }
-
-                off = 0;
-                for (i = 0; i < size; ++i) {
-                        rc = read(fd, buf, stride);
-                        if (rc != stride) {
-                                if (rc > 0) {
-                                        fill_stride(o_buf, rc, i, off);
-                                        dump_diff(o_buf, buf, rc, off);
-                                }
-                                sprintf(errmsg, "read of file %s", filename);
-                                FAIL(errmsg);
-                        }
-
-                        fill_stride(o_buf, stride, i, off);
-                        if (memcmp(o_buf, buf, stride) != 0) {
-                                bad = 1;
-                                dump_diff(o_buf, buf, stride, off);
-                        }
-                        off += stride;
-                }
-                if (bad == 1) {
-                        errno = 0;
-                        sprintf(errmsg, "Error: diff data read from %s", filename);
-                        FAIL(errmsg);
-                }
-        }
-
-        MPI_Barrier(MPI_COMM_WORLD);
-        fprintf(stderr, "passed barrier 5\n");
-
-        free(buf);
-        free(o_buf);
+       sprintf(filename, "%s/%s", testdir, name);
+
+       if (rank == 0) {
+               remove_file_or_dir(filename);
+
+               lum.lmm_magic = LOV_USER_MAGIC;
+               lum.lmm_stripe_size = 0;
+               lum.lmm_stripe_count = 0;
+               lum.lmm_stripe_offset = -1;
+
+               fd = open(filename, O_CREAT | O_RDWR | O_LOV_DELAY_CREATE,
+                       FILEMODE);
+               if (fd == -1) {
+                       sprintf(errmsg, "open of file %s", filename);
+                       FAIL(errmsg);
+               }
+
+               rc = ioctl(fd, LL_IOC_LOV_SETSTRIPE, &lum);
+               if (rc == -1) {
+                       sprintf(errmsg, "ioctl SETSTRIPE of file %s", filename);
+                       FAIL(errmsg);
+               }
+
+               if (close(fd) == -1) {
+                       sprintf(errmsg, "close of file %s", filename);
+                       FAIL(errmsg);
+               }
+       }
+
+       MPI_Barrier(MPI_COMM_WORLD);
+
+       if (stride < 0) {
+               if (rank == 0) {
+                       srandom(seed);
+                       while (stride < page_size/2) {
+                               stride = random();
+                               stride -= stride % 16;
+                               if (stride < 0)
+                                       stride = -stride;
+                               stride %= 2 * lum.lmm_stripe_size;
+                       }
+               }
+
+               MPI_Barrier(MPI_COMM_WORLD);
+
+               MPI_Bcast(&stride, 1, MPI_LONG, root, MPI_COMM_WORLD);
+       }
+
+       MPI_Barrier(MPI_COMM_WORLD);
+
+       buf = (char *)malloc(stride);
+       if (buf == NULL) {
+               sprintf(errmsg, "malloc of buf with size %ld", stride);
+               FAIL(errmsg);
+       }
+
+       if (rank == 0) {
+               fd = open(filename, O_RDWR);
+               if (fd == -1) {
+                       sprintf(errmsg, "open of file %s", filename);
+                       FAIL(errmsg);
+               }
+
+               off = 0;
+               fill_stride(buf, stride, 0, off);
+               rc = write(fd, buf, stride);
+               if (rc != stride) {
+                       sprintf(errmsg, "write of file %s return %d",
+                               filename, rc);
+                       FAIL(errmsg);
+               }
+               off += stride;
+
+               while (off < size * stride) {
+                       fill_stride(buf, stride, 0x8080808080808080ULL, off);
+                       rc = write(fd, buf, stride);
+                       if (rc != stride) {
+                               sprintf(errmsg, "write of file %s return %d",
+                                       filename, rc);
+                               FAIL(errmsg);
+                       }
+
+                       off += stride;
+               }
+
+               if (close(fd) == -1) {
+                       sprintf(errmsg, "close of file %s", filename);
+                       FAIL(errmsg);
+               }
+       }
+
+       MPI_Barrier(MPI_COMM_WORLD);
+
+       o_buf = (char *)malloc(stride);
+       if (o_buf == NULL) {
+               sprintf(errmsg, "malloc of o_buf with size %ld", stride);
+               FAIL(errmsg);
+       }
+
+       fd = open(filename, O_RDWR);
+       if (fd == -1) {
+               sprintf(errmsg, "open of file %s", filename);
+               FAIL(errmsg);
+       }
+
+       off = 0;
+       for (i = 1; i < size; ++i) {
+               if (rank == i) {
+                       rc = lseek(fd, off, SEEK_SET);
+                       if (rc != off) {
+                               sprintf(errmsg, "lseek of file %s return %d",
+                                       filename, rc);
+                               FAIL(errmsg);
+                       }
+
+                       rc = read(fd, buf, stride);
+                       if (rc != stride) {
+                               if (rc > 0) {
+                                       fill_stride(o_buf, rc, i - 1, off);
+                                       dump_diff(o_buf, buf, rc, off);
+                               }
+                               sprintf(errmsg, "read of file %s return %d",
+                                       filename, rc);
+                               FAIL(errmsg);
+                       }
+
+                       fill_stride(o_buf, stride, i - 1, off);
+                       if (memcmp(o_buf, buf, stride) != 0) {
+                               dump_diff(o_buf, buf, stride, off);
+                               errno = 0;
+                               sprintf(errmsg, "Error: diff data read from %s",
+                                       filename);
+                               FAIL(errmsg);
+                       }
+               }
+
+               off += stride;
+
+               if (rank == i) {
+                       fill_stride(buf, stride, i, off);
+                       rc = write(fd, buf, stride);
+                       if (rc != stride) {
+                               sprintf(errmsg, "write of file %s return %d",
+                                       filename, rc);
+                               FAIL(errmsg);
+                       }
+               }
+
+               MPI_Barrier(MPI_COMM_WORLD);
+       }
+
+       if (close(fd) == -1) {
+               sprintf(errmsg, "close of file %s", filename);
+               FAIL(errmsg);
+       }
+
+       MPI_Barrier(MPI_COMM_WORLD);
+
+       if (rank == 0) {
+               fd = open(filename, O_RDONLY);
+               if (fd == -1) {
+                       sprintf(errmsg, "open of file %s", filename);
+                       FAIL(errmsg);
+               }
+
+               off = 0;
+               for (i = 0; i < size; ++i) {
+                       rc = read(fd, buf, stride);
+                       if (rc != stride) {
+                               if (rc > 0) {
+                                       fill_stride(o_buf, rc, i, off);
+                                       dump_diff(o_buf, buf, rc, off);
+                               }
+                               sprintf(errmsg, "read of file %s", filename);
+                               FAIL(errmsg);
+                       }
+
+                       fill_stride(o_buf, stride, i, off);
+                       if (memcmp(o_buf, buf, stride) != 0) {
+                               bad = 1;
+                               dump_diff(o_buf, buf, stride, off);
+                       }
+                       off += stride;
+               }
+               if (bad == 1) {
+                       errno = 0;
+                       sprintf(errmsg, "Error: diff data read from %s",
+                               filename);
+                       FAIL(errmsg);
+               }
+       }
+
+       MPI_Barrier(MPI_COMM_WORLD);
+       fprintf(stderr, "passed barrier 5\n");
+
+       free(buf);
+       free(o_buf);
 }
 
 void cascading_rw(long stride, unsigned int seed)
 {
-        begin("setup");
-        end("setup");
+       begin("setup");
+       end("setup");
 
-        begin("test");
-        rw_file("cascading_rw", stride, seed);
-        end("test");
+       begin("test");
+       rw_file("cascading_rw", stride, seed);
+       end("test");
 
-        begin("cleanup");
-        remove_file("cascading_rw");
-        end("cleanup");
+       begin("cleanup");
+       remove_file("cascading_rw");
+       end("cleanup");
 }
 
 void usage(char *proc)
 {
-        int i;
-
-        if (rank == 0) {
-                printf("Usage: %s [-h] -d <testdir> [-s \"1024\"]\n", proc);
-                printf("           [-n \"13\"] [-e \"12345\"]\n"); 
-                printf("           [-v] [-V #] [-g]\n");
-                printf("\t-h: prints this help message\n");
-                printf("\t-d: the directory in which the tests will run\n");
-                printf("\t-s: process stride size\n");
-                printf("\t-n: repeat test # times\n");
-                printf("\t-n: random seed, used to re-create previous runs\n");
-                printf("\t-v: increase the verbositly level by 1\n");
-                printf("\t-V: select a specific verbosity level\n");
-                printf("\t-g: debug mode\n");
-        }
-
-        MPI_Initialized(&i);
-        if (i) MPI_Finalize();
-        exit(0);
+       int i;
+
+       if (rank == 0) {
+               printf("Usage: %s [-h] -d <testdir> [-s \"1024\"]\n", proc);
+               printf("           [-n \"13\"] [-e \"12345\"]\n");
+               printf("           [-v] [-V #] [-g]\n");
+               printf("\t-h: prints this help message\n");
+               printf("\t-d: the directory in which the tests will run\n");
+               printf("\t-s: process stride size\n");
+               printf("\t-n: repeat test # times\n");
+               printf("\t-n: random seed, used to re-create previous runs\n");
+               printf("\t-v: increase the verbositly level by 1\n");
+               printf("\t-V: select a specific verbosity level\n");
+               printf("\t-g: debug mode\n");
+       }
+
+       MPI_Initialized(&i);
+       if (i)
+               MPI_Finalize();
+       exit(0);
 }
 
 int main(int argc, char *argv[])
 {
-        int i, iterations = 16, c;
-        long stride = -1;
-        unsigned int seed = 0;
-
-        /* Check for -h parameter before MPI_Init so the binary can be
-           called directly, without, for instance, mpirun */
-        for (i = 1; i < argc; ++i) {
-                if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help"))
-                        usage(argv[0]);
-        }
-
-        MPI_Init(&argc, &argv);
-        MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-        MPI_Comm_size(MPI_COMM_WORLD, &size);
-
-                /* Parse command line options */
-        while (1) {
-                c = getopt(argc, argv, "d:e:ghn:s:vV:");
-                if (c == -1)
-                        break;
-
-                switch (c) {
-                case 'd':
-                        testdir = optarg;
-                        break;
-                case 'e':
-                        seed = (unsigned int)atoi(optarg);
-                        break;
-                case 'g':
-                        debug = 1;
-                        break;
-                case 'h':
-                        usage(argv[0]);
-                        break;
-                case 'n':
-                        iterations = atoi(optarg);
-                        break;
-                case 's':
-                        stride = atol(optarg);
-                        break;
-                case 'v':
-                        verbose += 1;
-                        break;
-                case 'V':
-                        verbose = atoi(optarg);
-                        break;
-                }
-        }
-
-        if (rank == 0)
-                printf("%s is running with %d process(es) %s\n",
-                       argv[0], size, debug ? "in DEBUG mode" : "\b\b");
-
-        if (size < 2) {
-                fprintf(stderr,
-                        "There should be at least 3 process to run the test!\n");
-                MPI_Abort(MPI_COMM_WORLD, 2);
-        }
-
-        if (testdir == NULL && rank == 0) {
-                fprintf(stderr, "Please specify a test directory! (\"%s -h\" for help)\n",
-                       argv[0]);
-                MPI_Abort(MPI_COMM_WORLD, 2);
-        }
-
-        lp_gethostname();
-
-        for (i = 0; i < iterations; ++i) {
-                if (rank == 0)
-                        printf("%s: Running test #%s(iter %d)\n",
-                               timestamp(), argv[0], i);
-
-                cascading_rw(stride, seed);
-                MPI_Barrier(MPI_COMM_WORLD);
-        }
-
-        if (rank == 0)
-                printf("%s: All tests passed!\n", timestamp());
-        MPI_Finalize();
-        return 0;
+       int i, iterations = 16, c;
+       long stride = -1;
+       unsigned int seed = 0;
+
+       /*
+        * Check for -h parameter before MPI_Init so the binary can be
+        * called directly, without, for instance, mpirun
+        */
+       for (i = 1; i < argc; ++i) {
+               if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help"))
+                       usage(argv[0]);
+       }
+
+       MPI_Init(&argc, &argv);
+       MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+       MPI_Comm_size(MPI_COMM_WORLD, &size);
+
+       /* Parse command line options */
+       while (1) {
+               c = getopt(argc, argv, "d:e:ghn:s:vV:");
+               if (c == -1)
+                       break;
+
+               switch (c) {
+               case 'd':
+                       testdir = optarg;
+                       break;
+               case 'e':
+                       seed = (unsigned int)atoi(optarg);
+                       break;
+               case 'g':
+                       debug = 1;
+                       break;
+               case 'h':
+                       usage(argv[0]);
+                       break;
+               case 'n':
+                       iterations = atoi(optarg);
+                       break;
+               case 's':
+                       stride = atol(optarg);
+                       break;
+               case 'v':
+                       verbose += 1;
+                       break;
+               case 'V':
+                       verbose = atoi(optarg);
+                       break;
+               }
+       }
+
+       if (rank == 0)
+               printf("%s is running with %d process(es) %s\n",
+                      argv[0], size, debug ? "in DEBUG mode" : "\b\b");
+
+       if (size < 2) {
+               fprintf(stderr,
+                       "There should be at least 3 process to run the test!\n");
+               MPI_Abort(MPI_COMM_WORLD, 2);
+       }
+
+       if (testdir == NULL && rank == 0) {
+               fprintf(stderr,
+                       "Please specify a test directory! (\"%s -h\" for help)\n",
+                       argv[0]);
+               MPI_Abort(MPI_COMM_WORLD, 2);
+       }
+
+       lp_gethostname();
+
+       for (i = 0; i < iterations; ++i) {
+               if (rank == 0)
+                       printf("%s: Running test #%s(iter %d)\n",
+                              timestamp(), argv[0], i);
+
+               cascading_rw(stride, seed);
+               MPI_Barrier(MPI_COMM_WORLD);
+       }
+
+       if (rank == 0)
+               printf("%s: All tests passed!\n", timestamp());
+       MPI_Finalize();
+       return 0;
 }