Add -r switch to src/bulkstat_unlink_test.c needed for QA test 183

(whitespace cleanups)

This patch adds a -r switch (using getopt as suggested by dchinner)
to src/bulkstat_unlink_test.c, that will implement the additional checks
described by vlad in PV 972128.

Basically we:
* Save the inode count in scount.
* Create nfiles new files (passed as argument).
* Open those nfiles.
* Unlink the files.
* Check that the inode count is greater than scount.
* close the files.
* Check that the inode count is the same as scount.

This patch also introduces more info on failure (Line number and file) before the exit()s, as well
as comments describing what we are doing.

This patch is to be used by QA test 183
SGI-Git-Id: 4ab8fa354f79070b4ba87cb09c4326d62da824fd
SGI-Git-author: Niv Sardi-Altivanik  <xaiki@chook.melbourne.sgi.com>
SGI-Git-date: Wed, 24 Oct 2007 13:24:27 +1000
Merge of master-melb:xfs-cmds:29964a by kenmcd.

diff --git a/src/bulkstat_unlink_test.c b/src/bulkstat_unlink_test.c
index bd9b871011004a317c2844b849716301706a0e31..ef5545cb4ba70f1e3684f391da98892a8b848402 100644 (file)
--- a/src/bulkstat_unlink_test.c
+++ b/src/bulkstat_unlink_test.c
@@ -1,5 +1,5 @@
 /*
- * $Id: bulkstat_unlink_test.c,v 1.1 2007/07/24 16:08:02 mohamedb.longdrop.melbourne.sgi.com Exp $
+ * $Id: bulkstat_unlink_test.c,v 1.2 2007/10/26 16:05:04 xaiki.longdrop.melbourne.sgi.com Exp $
  * Test bulkstat doesn't returned unlinked inodes.
  * Mark Goodwin <markgw@sgi.com> Fri Jul 20 09:13:57 EST 2007
  */
@@ -8,117 +8,178 @@
 #include <fcntl.h>
 #include <xfs/xfs.h>
 #include <unistd.h>
+#include <getopt.h>
 
 int
 main(int argc, char *argv[])
 {
-    int e;
-    int fd;
-    int i;
-    int j;
-    int k;
-    int nfiles;  
-    int stride;
-    struct stat sbuf;
-    ino_t *inodelist;
-    xfs_fsop_bulkreq_t a;
-    xfs_bstat_t *ret;
-    int iterations;
-    char fname[MAXPATHLEN];
-    char *dirname;
-
-    if (argc != 5) {
-       fprintf(stderr, "Usage: %s iterations nfiles stride dir\n", argv[0]);
-       fprintf(stderr, "Create dir with nfiles, unlink each stride'th file, sync, bulkstat\n");
-       exit(1);
-    }
-
-    iterations = atoi(argv[1]);
-    nfiles = atoi(argv[2]);
-    stride = atoi(argv[3]);
-    dirname = argv[4];
-
-    inodelist = (ino_t *)malloc(nfiles * sizeof(ino_t));
-    ret = (xfs_bstat_t *)malloc(nfiles * sizeof(xfs_bstat_t));
-
-    for (k=0; k < iterations; k++) {
-       xfs_ino_t last_inode = 0;
-       int count = 0;
-
-       printf("Iteration %d ... ", k);
-
-       memset(&a, 0, sizeof(xfs_fsop_bulkreq_t));
-       a.lastip = &last_inode;
-       a.icount = nfiles;
-       a.ubuffer = ret;
-       a.ocount = &count;
-
-       if (mkdir(dirname, 0755) < 0) {
-           perror(dirname);
-           exit(1);
+       int e;
+       int i;
+       int j;
+       int k;
+       int nfiles;
+       int stride;
+
+       int c;
+
+       struct stat sbuf;
+       ino_t *inodelist;
+       xfs_fsop_bulkreq_t a;
+       xfs_bstat_t *ret;
+       int iterations;
+       char fname[MAXPATHLEN];
+       char *dirname;
+       int chknb = 0;
+
+       while ((c = getopt(argc, argv, "r")) != -1) {
+               switch(c) {
+               case 'r':
+                       chknb = 1;
+                       break;
+               default:
+                       break;
+               }
        }
 
-       for (i=0; i < nfiles; i++) {
-           sprintf(fname, "%s/file%06d", dirname, i);
-           if ((fd = open(fname, O_RDWR | O_CREAT | O_TRUNC, 0644)) < 0) {
-               perror(fname);
-               exit(1);
-           }
-           write(fd, fname, sizeof(fname));
-           if (fstat(fd, &sbuf) < 0) {
-               perror(fname);
+       if ((argc - optind) != 4) {
+               fprintf(stderr, "Usage: %s iterations nfiles stride dir [options]\n", argv[0]);
+               fprintf(stderr, "Create dir with nfiles, unlink each stride'th file, sync, bulkstat\n");
                exit(1);
-           }
-           inodelist[i] = sbuf.st_ino;
-           close(fd);
        }
 
-       if ((fd = open(dirname, O_RDONLY)) < 0) {
-           perror(dirname);
-           exit(1);
-       }
 
-       /*
-        * test begins here
-        */
-       for (i=0; i < nfiles; i += stride) {
-           sprintf(fname, "%s/file%06d", dirname, i);
-           if (unlink(fname) < 0) {
-               perror(fname);
-               exit(1);
-           }
-       }
+       iterations = atoi(argv[optind++]);
+       iterations = atoi(argv[optind++]);
+       nfiles     = atoi(argv[optind++]);
+       stride     = atoi(argv[optind++]);
 
-       sync();
+       dirname = argv[optind++];
 
-       for (;;) {
-           if ((e = xfsctl(dirname, fd, XFS_IOC_FSBULKSTAT, &a)) < 0) {
-               perror("XFS_IOC_FSBULKSTAT:");
-               exit(1);
-           }
+       if (chknb)
+               printf("Runing extended checks.\n");
+
+       inodelist = (ino_t *)malloc(nfiles * sizeof(ino_t));
+       ret = (xfs_bstat_t *)malloc(nfiles * sizeof(xfs_bstat_t));
 
-           if (count == 0)
-               break;
+       for (k=0; k < iterations; k++) {
+               int fd[nfiles + 1];
+               xfs_ino_t last_inode = 0;
+               int count = 0, scount = -1;
 
-           for (i=0; i < count; i++) {
-               for (j=0; j < nfiles; j += stride) {
-                   if (ret[i].bs_ino == inodelist[j]) {
-                       /* oops ... */
-                       printf("failed. Unlinked inode %ld returned by bulkstat\n", inodelist[j]); 
+               printf("Iteration %d ... (%d files)", k, nfiles);
+
+               memset(&a, 0, sizeof(xfs_fsop_bulkreq_t));
+               a.lastip = &last_inode;
+               a.icount = nfiles;
+               a.ubuffer = ret;
+               a.ocount = &count;
+
+               if (mkdir(dirname, 0755) < 0) {
+                       printf("Warning (%s,%d), mkdir failed.\n", __FILE__, __LINE__);
+                       perror(dirname);
                        exit(1);
-                   }
                }
-           }
-       }
 
-       close(fd);
-       sprintf(fname, "rm -rf %s\n", dirname);
-       system(fname);
+               if ((fd[nfiles] = open(dirname, O_RDONLY)) < 0) {
+                       printf("Warning (%s,%d), open failed.\n", __FILE__, __LINE__);
+                       perror(dirname);
+                       exit(1);
+               }
+
+               if (chknb) { /* Get the original number of inodes (lazy) */
+                       sync();
+                       if (xfsctl(dirname, fd[nfiles], XFS_IOC_FSBULKSTAT, &a) != 0) {
+                               printf("Warning (%s:%d), xfsctl(XFS_IOC_FSBULKSTAT) FAILED.\n", __FILE__, __LINE__);
+                       }
 
-       sync();
-       sleep(2);
-       printf("passed\n");
-    }
+                       scount = count;
+               }
+
+               for (i=0; i < nfiles; i++) { /* Open the files */
+                       sprintf(fname, "%s/file%06d", dirname, i);
+                       if ((fd[i] = open(fname, O_RDWR | O_CREAT | O_TRUNC, 0644)) < 0) {
+                               printf("Warning (%s,%d), open failed.\n", __FILE__, __LINE__);
+                               perror(fname);
+                               exit(1);
+                       }
+                       write(fd[i], fname, sizeof(fname));
+                       if (fstat(fd[i], &sbuf) < 0) {
+                               printf("Warning (%s,%d), fstat failed.\n", __FILE__, __LINE__);
+                               perror(fname);
+                               exit(1);
+                       }
+                       inodelist[i] = sbuf.st_ino;
+                       unlink(fname);
+               }
+
+               if (chknb) {
+                       /*
+                        *The files are still opened (but unlink()ed) ,
+                        * we should have more inodes than before
+                        */
+                       sync();
+                       last_inode = 0;
+                       if (xfsctl(dirname, fd[nfiles], XFS_IOC_FSBULKSTAT, &a) != 0) {
+                               printf("Warning (%s:%d), xfsctl(XFS_IOC_FSBULKSTAT) FAILED.\n", __FILE__, __LINE__);
+                       }
+                       if (count < scount) {
+                               printf("ERROR, count(%d) < scount(%d).\n", count, scount);
+                               return -1;
+                       }
+               }
+
+               /* Close all the files */
+               for (i = 0; i < nfiles; i++) {
+                       close(fd[i]);
+               }
+
+               if (chknb) {
+                       /*
+                        * The files are now closed, we should be back to our,
+                        * previous inode count
+                        */
+                       sync();
+                       last_inode = 0;
+                       if (xfsctl(dirname, fd[nfiles], XFS_IOC_FSBULKSTAT, &a) != 0) {
+                               printf("Warning (%s:%d), xfsctl(XFS_IOC_FSBULKSTAT) FAILED.\n", __FILE__, __LINE__);
+                       }
+                       if (count != scount) {
+                               printf("ERROR, count(%d) != scount(%d).\n", count, scount);
+                               return -1;
+                       }
+               }
+
+               sync();
+               last_inode = 0;
+               for (;;) {
+                       if ((e = xfsctl(dirname, fd[nfiles], XFS_IOC_FSBULKSTAT, &a)) < 0) {
+                               printf("Warning (%s,%d), xfsctl failed.\n", __FILE__, __LINE__);
+                               perror("XFS_IOC_FSBULKSTAT:");
+                               exit(1);
+                       }
+
+                       if (count == 0)
+                               break;
+
+                       for (i=0; i < count; i++) {
+                               for (j=0; j < nfiles; j += stride) {
+                                       if (ret[i].bs_ino == inodelist[j]) {
+                                               /* oops ... */
+                                               printf("failed. Unlinked inode %ld returned by bulkstat\n", inodelist[j]);
+                                               exit(1);
+                                       }
+                               }
+                       }
+               }
+
+               close(fd[nfiles]);
+               sprintf(fname, "rm -rf %s\n", dirname);
+               system(fname);
+
+               sync();
+               sleep(2);
+               printf("passed\n");
+       }
 
-    exit(0);
+       exit(0);
 }