[PATCH] Random map fix

[fio.git] / log.c

diff --git a/log.c b/log.c
index f61215eae73e2b63e3868e713f99bf95eddeb240..a705e5021415ad7069e169ba06906435724d1f37 100644 (file)
--- a/log.c
+++ b/log.c
@@ -185,7 +185,8 @@ int init_iolog(struct thread_data *td)
 
 int setup_rate(struct thread_data *td)
 {
 
 int setup_rate(struct thread_data *td)
 {

-       int nr_reads_per_sec;
+       unsigned long long rate;
+       int nr_reads_per_msec;

 
        if (!td->rate)
                return 0;
 
        if (!td->rate)
                return 0;


@@ -195,8 +196,14 @@ int setup_rate(struct thread_data *td)
                return -1;
        }
 
                return -1;
        }
 

-       nr_reads_per_sec = (td->rate * 1024) / td->min_bs[DDIR_READ];
-       td->rate_usec_cycle = 1000000 / nr_reads_per_sec;
+       rate = td->rate;
+       nr_reads_per_msec = (rate * 1024 * 1000) / td->min_bs[DDIR_READ];
+       if (!nr_reads_per_msec) {
+               log_err("rate lower than supported\n");
+               return -1;
+       }
+
+       td->rate_usec_cycle = 1000000000ULL / nr_reads_per_msec;

        td->rate_pending_usleep = 0;
        return 0;
 }
        td->rate_pending_usleep = 0;
        return 0;
 }


@@ -211,14 +218,12 @@ void setup_log(struct io_log **log)
        *log = l;
 }
 
        *log = l;
 }
 

-void finish_log(struct thread_data *td, struct io_log *log, const char *name)
+void __finish_log(struct io_log *log, const char *name)

 {
 {

-       char file_name[256];
-       FILE *f;

        unsigned int i;
        unsigned int i;

+       FILE *f;

 
 

-       snprintf(file_name, 200, "client%d_%s.log", td->thread_number, name);
-       f = fopen(file_name, "w");
+       f = fopen(name, "w");

        if (!f) {
                perror("fopen log");
                return;
        if (!f) {
                perror("fopen log");
                return;


@@ -231,3 +236,11 @@ void finish_log(struct thread_data *td, struct io_log *log, const char *name)
        free(log->log);
        free(log);
 }
        free(log->log);
        free(log);
 }

+
+void finish_log(struct thread_data *td, struct io_log *log, const char *name)
+{
+       char file_name[256];
+
+       snprintf(file_name, 200, "client%d_%s.log", td->thread_number, name);
+       __finish_log(log, file_name);
+}