land b_md onto HEAD. the highlights:

[fs/lustre-release.git] / lustre / tests / fsx.c

diff --git a/lustre/tests/fsx.c b/lustre/tests/fsx.c
index aba33d5..859f40a 100644 (file)
--- a/lustre/tests/fsx.c
+++ b/lustre/tests/fsx.c
@@ -532,6 +532,13 @@ domapread(unsigned offset, unsigned size)
                prterr("domapread: mmap");
                report_failure(190);
        }
+       if (!quiet && (debug > 1 &&
+                       (monitorstart == -1 ||
+                        (offset + size > monitorstart &&
+                         (monitorend == -1 || offset <= monitorend))))) {
+               gettimeofday(&t, NULL);
+               prt("       %lu.%06lu mmap done\n", t.tv_sec, t.tv_usec);
+       }
        memcpy(temp_buf, p + pg_offset, size);
        if (!quiet && (debug > 1 &&
                        (monitorstart == -1 ||
@@ -683,6 +690,13 @@ domapwrite(unsigned offset, unsigned size)
                        prterr("domapwrite: ftruncate");
                        exit(201);
                }
+               if (!quiet && (debug > 1 &&
+                              (monitorstart == -1 ||
+                               (offset + size > monitorstart &&
+                                (monitorend == -1 || offset <= monitorend))))) {
+                       gettimeofday(&t, NULL);
+                       prt("       %lu.%06lu truncate done\n", t.tv_sec, t.tv_usec);
+       }
        }
        pg_offset = offset & page_mask;
        map_size  = pg_offset + size;
@@ -693,6 +707,13 @@ domapwrite(unsigned offset, unsigned size)
                prterr("domapwrite: mmap");
                report_failure(202);
        }
+       if (!quiet && (debug > 1 &&
+                       (monitorstart == -1 ||
+                        (offset + size > monitorstart &&
+                         (monitorend == -1 || offset <= monitorend))))) {
+               gettimeofday(&t, NULL);
+               prt("       %lu.%06lu mmap done\n", t.tv_sec, t.tv_usec);
+       }
        memcpy(p + pg_offset, good_buf + offset, size);
        if (!quiet && (debug > 1 &&
                        (monitorstart == -1 ||
@@ -821,7 +842,7 @@ docloseopen(void)
        }
        if (!quiet && debug > 1) {
                gettimeofday(&t, NULL);
-               prt("       %lu.%06lu opendone\n", t.tv_sec, t.tv_usec);
+               prt("       %lu.%06lu open done\n", t.tv_sec, t.tv_usec);
        }
 }