X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fwritemany.c;h=72d1ac6a71a7f37da696087ffef52989d46d7ed9;hb=7c82a9c81d03dec059132dddafd0bdde188b321d;hp=03b48fb388b8cdd43611c6f4af94c21cedc5eb37;hpb=113303973ec9f8484eb2355a1a6ef3c4c7fd6a56;p=fs%2Flustre-release.git

diff --git a/lustre/tests/writemany.c b/lustre/tests/writemany.c
index 03b48fb..72d1ac6 100644
--- a/lustre/tests/writemany.c
+++ b/lustre/tests/writemany.c
@@ -1,6 +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) 2007, 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 <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -145,6 +176,7 @@ int run_one_child(char *file, int thread, int seconds)
                 maxrand *= 10;
 
         gettimeofday(&start, NULL);
+        cur = start;
 
         while(!rc) {
                 if (usr1_received)
@@ -156,7 +188,8 @@ int run_one_child(char *file, int thread, int seconds)
                                 break;
                 }
                 
-                sprintf(filename, "%s-%d-%ld", file, thread, nfiles);
+		snprintf(filename, sizeof(filename), "%s-%d-%ld",
+			 file, thread, nfiles);
 
                 fd = open(filename, O_RDWR | O_CREAT, 0666);
                 if (fd < 0) {
@@ -200,7 +233,8 @@ int run_one_child(char *file, int thread, int seconds)
                 printf("%s: %7ld files, %4ld MB in %.2fs (%7.2f files/s, "
                        "%5.2f MB/s): rc = %d\n",
                        cmdname, nfiles, nbytes >> 20, diff,
-                       (double)nfiles / diff, (double)nbytes/1024/1024 / diff,
+                       diff == 0 ? (double)0 : (double)nfiles / diff,
+                       diff == 0 ? (double)0 : (double)nbytes/1024/1024 / diff,
                        rc);
 
         return rc;
@@ -214,7 +248,7 @@ int main(int argc, char *argv[])
         char *directory;
         int i = 1, rc = 0;
 
-        sprintf(cmdname, "%s", argv[0]);
+	snprintf(cmdname, sizeof(cmdname), "%s", argv[0]);
 
         while((i < argc) && (argv[i][0] == '-')) {
                 switch (argv[i][1]) {
@@ -258,7 +292,7 @@ int main(int argc, char *argv[])
                 }
                 if (rc == 0) {
                         /* children */
-                        sprintf(cmdname, "%s-%d", argv[0], i);
+			snprintf(cmdname, sizeof(cmdname), "%s-%d", argv[0], i);
                         return (run_one_child(directory, i, duration));
                 } else {
                         /* parent */