lfsr-test: print total elapsed time correctly

[fio.git] / t / lfsr-test.c

diff --git a/t/lfsr-test.c b/t/lfsr-test.c
index 2eee0c648e50aad5b3264f7407bc858dd4ad70cc..4352b89f3319959ab55c8e90d15e3878717b432e 100644 (file)
--- a/t/lfsr-test.c
+++ b/t/lfsr-test.c
@@ -8,6 +8,8 @@
 #include <sys/stat.h>
 
 #include "../lib/lfsr.h"
 #include <sys/stat.h>
 
 #include "../lib/lfsr.h"

+#include "../gettime.h"
+#include "../fio_time.h"

 
 void usage()
 {
 
 void usage()
 {


@@ -25,7 +27,7 @@ void usage()
 int main(int argc, char *argv[])
 {
        int r;
 int main(int argc, char *argv[])
 {
        int r;

-       struct timespec start, end;
+       struct timeval start, end;

        struct fio_lfsr *fl;
        int verify = 0;
        unsigned int spin = 0;
        struct fio_lfsr *fl;
        int verify = 0;
        unsigned int spin = 0;


@@ -87,7 +89,7 @@ int main(int argc, char *argv[])
         */
        fprintf(stderr, "\nTest initiated... ");
        fio_gettime(&start, NULL);
         */
        fprintf(stderr, "\nTest initiated... ");
        fio_gettime(&start, NULL);

-       while (!lfsr_next(fl, &i, fl->max_val)) {
+       while (!lfsr_next(fl, &i)) {

                if (verify)
                        *(uint8_t *)(v + i) += 1;
        }
                if (verify)
                        *(uint8_t *)(v + i) += 1;
        }


@@ -113,16 +115,15 @@ int main(int argc, char *argv[])
        }
 
        /* Calculate elapsed time and mean time per number */
        }
 
        /* Calculate elapsed time and mean time per number */

-       total = (end.tv_sec - start.tv_sec) * pow(10,9) +
-               end.tv_nsec - start.tv_nsec;
+       total = utime_since(&start, &end);

        mean = total / fl->num_vals;
 
        printf("\nTime results ");
        if (verify)
                printf("(slower due to verification)");
        printf("\n==============================\n");
        mean = total / fl->num_vals;
 
        printf("\nTime results ");
        if (verify)
                printf("(slower due to verification)");
        printf("\n==============================\n");

-       printf("Elapsed: %lf s\n", total / pow(10,9));
-       printf("Mean:    %lf ns\n", mean);
+       printf("Elapsed: %lf s\n", total / pow(10,6));
+       printf("Mean:    %lf us\n", mean);

 
        free(v_start);
        free(fl);
 
        free(v_start);
        free(fl);