X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fiopentest2.c;h=8a794928f1cdda2f18ef10950098df920a4cd8d7;hb=0fda09a56aaf8105c7c5cb0326d0c8fcec6fc04c;hp=6f95f955b6046dfa6ba39a3b674d875dae8ece31;hpb=66ed8c93cbcbb311f1e526e1abc40a372028e611;p=fs%2Flustre-release.git

diff --git a/lustre/tests/iopentest2.c b/lustre/tests/iopentest2.c
index 6f95f95..8a79492 100644
--- a/lustre/tests/iopentest2.c
+++ b/lustre/tests/iopentest2.c
@@ -1,5 +1,37 @@
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
+ *
+ * GPL HEADER START
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
  */
 
 #include <sys/types.h>
@@ -12,6 +44,7 @@
 #include <string.h>
 #include <libgen.h>
 #include <errno.h>
+#include <sys/wait.h>
 
 const char *progname;
 const char usage_fmt[] = "Usage: %s <mountpoint>\n";
@@ -62,12 +95,12 @@ static char *get_iname(char *fname, const char *mtpt)
 
 int main(int argc, char *argv[])
 {
-        char *fname, *mtpt, *pname;
+        char *fname, *mtpt;
         char *fname_iname, *dir;
         char *dir_iname = NULL, *foo = NULL, *bar = NULL;
         int rc, fd, i, thread = 0;
+        int pidlist[10];
 
-        pname = strdup(argv[0]);
         progname = basename(argv[0]);
 
         if (argc != 2) {
@@ -86,6 +119,7 @@ int main(int argc, char *argv[])
                         break;
                 }
                 printf("%s: thread #%d (PID %d) started\n", argv[0], i, rc);
+                pidlist[i-1] = rc;
                 rc = 0;
         }
 
@@ -175,6 +209,9 @@ int main(int argc, char *argv[])
 
                         free(dir_iname);
                 }
+        } else {
+                        for ( i=0; i<10; i++)
+                                waitpid(pidlist[i], NULL, 0);
         }
         return 0;
 }