#define dmesg if (debug) printf
#define DISPLAY_PROGRESS() { \
- if ((++nops % CHECK_COUNT) == 0 && verbose) { \
- curTime = time(0); \
+ if (verbose && (nops % CHECK_COUNT == 0)) { \
+ curTime = MPI_Wtime(); \
interval = curTime - lastTime; \
if (interval > DISPLAY_TIME || nops % DISPLAY_COUNT == 0) { \
- rate = (float)(nops - lastOps); \
- if (interval > 1) \
- rate /= (float)interval; \
- printf("Rank %d: %.2f %ss/sec %lu secs " \
- "(total: %d %ss %lu secs)\n", \
+ rate = (double)(nops - lastOps)/interval; \
+ printf("Rank %d: %.2f %ss/sec %.2f secs " \
+ "(total: %d %ss %.2f secs)\n", \
myrank, rate, cmd, interval, \
nops, cmd, curTime - startTime); \
lastOps = nops; \
static void
process_args(int argc, char *argv[])
{
- char c, *cp, *endptr;
- int i, index, offset, tmpend, rc;
+ char *cp, *endptr;
+ int i, index, offset, tmpend, rc, c;
char tmp[16];
FILE * seed_file;
struct option *opt;
if ((*endptr != 0) || (iters <= 0)) {
fatal(0, "Invalid --iters value.\n");
}
- if (mode != LOOKUP && mode != OPEN && mode != STAT) {
+ if (mode != LOOKUP && mode != OPEN) {
usage(stderr, "--iters only makes sense with "
- "--lookup, --open, or --stat.\n");
+ "--lookup or --open.\n");
}
break;
case TIME:
break;
case RANDOM:
case READDIR:
- if (mode != LOOKUP && mode != OPEN && mode != STAT) {
+ if (mode != LOOKUP && mode != OPEN) {
fatal(0, "--%s can only be specified with "
- "--lookup, --open, or --stat.\n",
+ "--lookup, or --open.\n",
(char *)longOpts[index].name);
}
order = c;
usage(stderr, "too many arguments %d >= %d.\n", optind, argc);
}
- if (mode == CREATE || mode == MKNOD || mode == UNLINK) {
+ if (mode == CREATE || mode == MKNOD || mode == UNLINK || mode == STAT) {
if (seconds != 0) {
if (nfiles == 0)
nfiles = INT_MAX;
usage(stderr, "--nfiles or --time must be specified "
"with %s.\n", cmd);
}
- } else if (mode == LOOKUP || mode == OPEN || mode == STAT) {
+ } else if (mode == LOOKUP || mode == OPEN) {
if (seconds != 0) {
if (iters == 0)
iters = INT_MAX;
int
main(int argc, char *argv[])
{
- int i, j, fd, rc, nops, lastOps, ag_ops;
- float rate, ag_rate;
- time_t startTime, lastTime, curTime, interval;
+ int i, j, fd, rc, nops, lastOps;
+ int ag_ops = 0;
+ double ag_interval = 0;
+ double ag_rate = 0;
+ double rate, avg_rate, effective_rate;
+ double startTime, curTime, lastTime, interval;
+ time_t timestamp;
char * file;
rc = MPI_Init(&argc, &argv);
process_args(argc, argv);
- startTime = time(0);
+ timestamp = time(0);
if ((myrank == 0) || debug) {
printf("%d: %s starting at %s",
- myrank, hostname, ctime(&startTime));
+ myrank, hostname, ctime(×tamp));
}
/* if we're not measuring creation rates then precreate
dir, strerror(rc));
}
- startTime = time(0);
+ timestamp = time(0);
j = random() % nfiles;
dmesg("%d: %s initializing dir offset %u: %s",
- myrank, hostname, j, ctime(&startTime));
+ myrank, hostname, j, ctime(×tamp));
for (i = 0; i <= j; i++) {
if ((dir_entry = readdir(directory)) == NULL) {
}
}
- lastTime = time(0);
+ timestamp = time(0);
dmesg("%d: index %d, filename %s, offset %ld: "
"%s initialization complete: %s",
myrank, i, dir_entry->d_name, telldir(directory),
- hostname, ctime(&lastTime));
+ hostname, ctime(×tamp));
}
- rc = MPI_Barrier(MPI_COMM_WORLD);
- if (rc != MPI_SUCCESS)
- fatal(myrank, "prep MPI_Barrier failed: %d\n", rc);
-
if (seconds) {
act.sa_handler = sigalrm_handler;
(void)sigemptyset(&act.sa_mask);
alarm(seconds);
}
- startTime = lastTime = time(0);
+ rc = MPI_Barrier(MPI_COMM_WORLD);
+ if (rc != MPI_SUCCESS)
+ fatal(myrank, "prep MPI_Barrier failed: %d\n", rc);
+
+ startTime = lastTime = MPI_Wtime();
nops = lastOps = 0;
switch (mode) {
}
close(fd);
+ nops++;
DISPLAY_PROGRESS();
}
"error: %s\n", filename, strerror(rc));
}
+ nops++;
DISPLAY_PROGRESS();
}
break;
filename, strerror(rc));
}
+ nops++;
DISPLAY_PROGRESS();
}
break;
close(fd);
+ nops++;
DISPLAY_PROGRESS();
}
break;
case STAT:
- for (; nops < iters && !alarm_caught;) {
- rc = stat(file = next_file(), &statbuf);
+ for (; begin <= end && !alarm_caught; begin += dirthreads) {
+ sprintf(filename, filefmt, begin);
+ rc = stat(filename, &statbuf);
if (rc) {
if (((rc = errno) == EINTR) && alarm_caught)
break;
+ if (((rc = errno) == ENOENT) && ignore)
+ continue;
fatal(myrank, "stat(%s) error: %s\n",
- file, strerror(rc));
+ filename, strerror(rc));
}
+ nops++;
DISPLAY_PROGRESS();
}
break;
filename, strerror(rc));
}
+ nops++;
DISPLAY_PROGRESS();
}
break;
}
- curTime = time(0);
+ rc = MPI_Barrier(MPI_COMM_WORLD);
+ if (rc != MPI_SUCCESS)
+ fatal(myrank, "prep MPI_Barrier failed: %d\n", rc);
+ curTime = MPI_Wtime();
interval = curTime - startTime;
- rate = (float)(nops);
- if (interval != 0)
- rate /= (float)interval;
+ rate = (double) (nops) / interval;
rc = MPI_Reduce(&nops, &ag_ops, 1, MPI_INT, MPI_SUM, 0,
MPI_COMM_WORLD);
fatal(myrank, "Failure in MPI_Reduce of total ops.\n");
}
- rc = MPI_Reduce(&rate, &ag_rate, 1, MPI_FLOAT, MPI_SUM, 0,
+ rc = MPI_Reduce(&interval, &ag_interval, 1, MPI_DOUBLE, MPI_SUM, 0,
+ MPI_COMM_WORLD);
+ if (rc != MPI_SUCCESS) {
+ fatal(myrank, "Failure in MPI_Reduce of total interval.\n");
+ }
+
+ rc = MPI_Reduce(&rate, &ag_rate, 1, MPI_DOUBLE, MPI_SUM, 0,
MPI_COMM_WORLD);
if (rc != MPI_SUCCESS) {
fatal(myrank, "Failure in MPI_Reduce of aggregated rate.\n");
}
if (myrank == 0) {
- printf("Rate: %.2f %ss/sec (total: %d threads %d %ss %lu secs)"
- "\n", ag_rate, cmd, nthreads, ag_ops, cmd, interval);
+
+ curTime = MPI_Wtime();
+ interval = curTime - startTime;
+ effective_rate = (double) ag_ops / interval;
+ avg_rate = (double) ag_ops / ag_interval;
+
+ printf("Rate: %.2f eff %.2f aggr %.2f avg client %ss/sec "
+ "(total: %d threads %d %ss %d dirs %d threads/dir %.2f secs)\n",
+ effective_rate, ag_rate, avg_rate, cmd, nthreads, ag_ops,
+ cmd, ndirs, dirthreads, interval);
}
if (recreate) {
}
}
- curTime = time(0);
+ timestamp = time(0);
if ((myrank == 0) || debug) {
printf("%d: %s finished at %s",
- myrank, hostname, ctime(&curTime));
+ myrank, hostname, ctime(×tamp));
}
MPI_Finalize();
git://git.whamcloud.com / fs / lustre-release.git / blobdiff