X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fiopentest2.c;h=046de92b963de676890673be607294439fb96198;hb=7bb892f4f3de837a940d867b97fe14013ad67dc6;hp=dfa0b828cc5c38e5109d25926e022c6e2550d7d9;hpb=ead624f0815c7b82d45b92322e9fb0abef027e49;p=fs%2Flustre-release.git

diff --git a/lustre/tests/iopentest2.c b/lustre/tests/iopentest2.c
index dfa0b82..046de92 100644
--- a/lustre/tests/iopentest2.c
+++ b/lustre/tests/iopentest2.c
@@ -1,3 +1,7 @@
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+ * vim:expandtab:shiftwidth=8:tabstop=8:
+ */
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -8,10 +12,11 @@
 #include <string.h>
 #include <libgen.h>
 #include <errno.h>
+#include <sys/wait.h>
 
+const char *progname;
 const char usage_fmt[] = "Usage: %s <mountpoint>\n";
 #define INAME_LEN (PATH_MAX + 1)
-const char *progname;
 
 #define CHECK_IT(exp, pstr) \
 if (!(exp)) { \
@@ -33,16 +38,24 @@ static char *get_iname(char *fname, const char *mtpt)
         CHECK_IT(iname, "malloc() failed");
 
         fd = open(fname, O_CREAT, 0644);
-        CHECK_IT(fd >= 0 || errno == EISDIR, "open(fname) failed");
+        if (fd < 0 && errno != EISDIR) {
+                fprintf(stderr, "%s:%d: open(%s) failed: %s\n", __FILE__,
+                        __LINE__, fname, strerror(errno));
+                exit(1);
+        }
 
         if (fd >= 0)
                 close(fd);
 
         rc = stat(fname, &buf);
-        CHECK_IT(rc == 0, "stat(fname) failed");
+        if (rc != 0) {
+                fprintf(stderr, "%s:%d: stat(%s) failed: %s\n", __FILE__,
+                        __LINE__, fname, strerror(errno));
+                exit(1);
+        }
 
         rc = snprintf(iname, INAME_LEN,
-                      "%s/__iopen__/%lu", mtpt, buf.st_ino);
+                      "%s/__iopen__/%lu", mtpt, (unsigned long)buf.st_ino);
         CHECK_SNPRINTF(rc, INAME_LEN);
 
         return iname;
@@ -51,40 +64,35 @@ static char *get_iname(char *fname, const char *mtpt)
 int main(int argc, char *argv[])
 {
         char *fname, *mtpt, *pname;
-        int rc, fd;
         char *fname_iname, *dir;
         char *dir_iname = NULL, *foo = NULL, *bar = NULL;
-
-        int i,j;
-        int thread=0;
+        int rc, fd, i, thread = 0;
+        int pidlist[10];
 
         pname = strdup(argv[0]);
         progname = basename(argv[0]);
-                                                                                                                             
+
         if (argc != 2) {
                 fprintf(stderr, usage_fmt, progname);
                 return 1;
         }
  
-        for(i=1;i<=10;i++) {
-                rc=fork();
+        for (i = 1; i <= 10; i++) {
+                rc = fork();
                 if (rc < 0) {
-                        fprintf(stderr, "error: %s: #%ld - %s\n", argv[0], i,
+                        fprintf(stderr, "error: %s: #%d - %s\n", argv[0], i,
                                 strerror(rc = errno));
                         break;
                 } else if (rc == 0) {
                         thread = i;
                         break;
-                } else {
-                        printf("%s: thread #%ld (PID %d) started\n",
-                               argv[0], i, rc);
                 }
+                printf("%s: thread #%d (PID %d) started\n", argv[0], i, rc);
+                pidlist[i-1] = rc;
                 rc = 0;
         }
 
-        if (thread!=0){
-                j=1000;
-
+        if (thread != 0) {
                 mtpt  = argv[1];
                 fname = malloc(INAME_LEN);
                 CHECK_IT(fname, "malloc() failed");
@@ -94,15 +102,18 @@ int main(int argc, char *argv[])
                 CHECK_SNPRINTF(rc, INAME_LEN);
 
                 rc = mkdir(fname, 0644);
-                CHECK_IT(rc == 0, "mkdir(fname) failed");
+                if (rc != 0) {
+                        fprintf(stderr, "%s:%d: mkdir(%s) failed: %s\n",
+                                __FILE__, __LINE__, fname, strerror(errno));
+                        exit(1);
+                }
 
                 fname_iname = get_iname(fname, mtpt);
 
                 dir = malloc(INAME_LEN);
                 CHECK_IT(dir, "malloc() failed");
 
-                rc = snprintf(dir, INAME_LEN,
-                              "%s/dir", fname_iname);
+                rc = snprintf(dir, INAME_LEN, "%s/dir", fname_iname);
                 CHECK_SNPRINTF(rc, INAME_LEN);
 
                 foo = malloc(INAME_LEN);
@@ -111,35 +122,65 @@ int main(int argc, char *argv[])
                 bar = malloc(INAME_LEN);
                 CHECK_IT(bar, "malloc() failed");
 
-                do {
+                for (i = 0; i < 1000; i++) {
                         rc = mkdir(dir, 0644);
-                        CHECK_IT(rc == 0, "mkdir() failed");
+                        if (rc != 0) {
+                                fprintf(stderr, "%s:%d: mkdir(%s) failed: %s\n",
+                                        __FILE__, __LINE__, dir,
+                                        strerror(errno));
+                                exit(1);
+                        }
 
                         dir_iname = get_iname(dir, mtpt);
-		
-                        rc = snprintf(foo, INAME_LEN,
-                                      "%s/bar", dir_iname);
+
+                        rc = snprintf(foo, INAME_LEN, "%s/bar", dir_iname);
                         CHECK_SNPRINTF(rc, INAME_LEN);
-		
-                        rc = snprintf(bar, INAME_LEN,
-                                      "%s/bar", dir_iname);
+
+                        rc = snprintf(bar, INAME_LEN, "%s/bar", dir_iname);
                         CHECK_SNPRINTF(rc, INAME_LEN);
 
                         fd = open(foo, O_CREAT, 0644);
-                        CHECK_IT(fd >= 0, "open(foo) failed");
-                        close(fd);
+                        if (fd < 0) {
+                                fprintf(stderr, "%s:%d: open(%s) failed: %s\n",
+                                        __FILE__, __LINE__, foo,
+                                        strerror(errno));
+                                exit(1);
+                        }
+                        rc = close(fd);
+                        if (rc != 0) {
+                                fprintf(stderr, "%s:%d: close() failed: %s\n",
+                                        __FILE__, __LINE__, strerror(errno));
+                                exit(1);
+                        }
 
                         rc = rename(foo, bar);
-                        CHECK_IT(rc == 0, "rename(foo, bar) failed");
+                        if (rc != 0) {
+                                fprintf(stderr, "%s:%d: rename(%s, %s) failed: "
+                                        "%s\n", __FILE__, __LINE__, foo, bar,
+                                        strerror(errno));
+                                exit(1);
+                        }
 
                         rc = unlink(bar);
-                        CHECK_IT(rc == 0, "unlink(bar) failed");
+                        if (rc != 0) {
+                                fprintf(stderr, "%s:%d: unlink(%s) failed: "
+                                        "%s\n", __FILE__, __LINE__, bar,
+                                        strerror(errno));
+                                exit(1);
+                        }
                         rc = rmdir(dir);
-                        CHECK_IT(rc == 0, "rmdir(dir) failed");
+                        if (rc != 0) {
+                                fprintf(stderr, "%s:%d: rmdir(%s) failed: %s\n",
+                                        __FILE__, __LINE__, dir,
+                                        strerror(errno));
+                                exit(1);
+                        }
 
                         free(dir_iname);
-                        j--;
-                } while (j>=1);
+                }
+        } else {
+                        for ( i=0; i<10; i++)
+                                waitpid(pidlist[i], NULL, 0);
         }
         return 0;
 }