-/* -*- 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.
*
* 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.
+ * http://www.gnu.org/licenses/gpl-2.0.html
*
* GPL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
*
* Author: You Feng <youfeng@clusterfs.com>
*/
-
+#include <limits.h>
#include <mpi.h>
#include <stdio.h>
#include <string.h>
#include <time.h>
#include <sys/time.h>
#include <sys/types.h>
+#include <asm/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <sys/ioctl.h>
#include <fcntl.h>
#include <errno.h>
-#include <liblustre.h>
#include "lustre/lustre_user.h"
-#include "lustre/tests/mpi/lp_utils.h"
+#include "lp_utils.h"
#define MAX_PROCESSES 8
return datestring;
}
-inline void begin(char *str) {
+void begin(char *str) {
if (verbose > 0 && rank == 0) {
gettimeofday(&t1, NULL);
printf("%s:\tBeginning %s\n", timestamp(), str);
}
}
-inline void end(char *str) {
+void end(char *str) {
float elapsed;
MPI_Barrier(MPI_COMM_WORLD);
if (verbose > 0 && rank == 0) {
gettimeofday(&t2, NULL);
- elapsed = (t2.tv_sec + ((float)t2.tv_usec/1000000))
- - (t1.tv_sec + ((float)t1.tv_usec/1000000));
+
+ elapsed = t2.tv_sec - t1.tv_sec +
+ (float)(t2.tv_usec-t1.tv_usec)/1000000;
if (elapsed >= 60) {
printf("%s:\tFinished %-15s(%.2f min)\n",
timestamp(), str, elapsed / 60);
} else {
printf("%s:\tFinished %-15s(%.3f sec)\n",
- timestamp(), str, elapsed);
+ timestamp(), str, elapsed);
}
fflush(stdout);