[PATCH] Warn on conflicting read/write iolog

[fio.git] / init.c

diff --git a/init.c b/init.c
index d259c998c39215c3e0914b5aa1a57829bd464f9f..3b1f88288b289e31f7669389c21ee8b554254e89 100644 (file)
--- a/init.c
+++ b/init.c
@@ -55,55 +55,6 @@ int write_bw_log = 0;
 int exitall_on_terminate = 0;
 unsigned long long mlock_size = 0;
 
-static int setup_rate(struct thread_data *td)
-{
-       int nr_reads_per_sec;
-
-       if (!td->rate)
-               return 0;
-
-       if (td->rate < td->ratemin) {
-               fprintf(stderr, "min rate larger than nominal rate\n");
-               return -1;
-       }
-
-       nr_reads_per_sec = (td->rate * 1024) / td->min_bs;
-       td->rate_usec_cycle = 1000000 / nr_reads_per_sec;
-       td->rate_pending_usleep = 0;
-       return 0;
-}
-
-static void setup_log(struct io_log **log)
-{
-       struct io_log *l = malloc(sizeof(*l));
-
-       l->nr_samples = 0;
-       l->max_samples = 1024;
-       l->log = malloc(l->max_samples * sizeof(struct io_sample));
-       *log = l;
-}
-
-void finish_log(struct thread_data *td, struct io_log *log, const char *name)
-{
-       char file_name[256];
-       FILE *f;
-       unsigned int i;
-
-       snprintf(file_name, 200, "client%d_%s.log", td->thread_number, name);
-       f = fopen(file_name, "w");
-       if (!f) {
-               perror("fopen log");
-               return;
-       }
-
-       for (i = 0; i < log->nr_samples; i++)
-               fprintf(f, "%lu, %lu, %u\n", log->log[i].time, log->log[i].val, log->log[i].ddir);
-
-       fclose(f);
-       free(log->log);
-       free(log);
-}
-
 static struct thread_data *get_new_job(int global, struct thread_data *parent)
 {
        struct thread_data *td;
@@ -216,14 +167,17 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
        }
 
        if (td->filetype == FIO_TYPE_FILE) {
+               char tmp[PATH_MAX];
+
                if (td->directory && td->directory[0] != '\0')
-                       sprintf(td->file_name, "%s/%s.%d", td->directory, jobname, td->jobnum);
+                       sprintf(tmp, "%s/%s.%d", td->directory, jobname, td->jobnum);
                else
-                       sprintf(td->file_name, "%s.%d", jobname, td->jobnum);
+                       sprintf(tmp, "%s.%d", jobname, td->jobnum);
+               td->file_name = strdup(tmp);
        } else
-               strncpy(td->file_name, jobname, sizeof(td->file_name) - 1);
+               td->file_name = strdup(jobname);
 
-       sem_init(&td->mutex, 0, 0);
+       fio_sem_init(&td->mutex, 0);
 
        td->clat_stat[0].min_val = td->clat_stat[1].min_val = ULONG_MAX;
        td->slat_stat[0].min_val = td->slat_stat[1].min_val = ULONG_MAX;
@@ -305,9 +259,9 @@ int init_random_state(struct thread_data *td)
 
        close(fd);
 
-       srand48_r(seeds[0], &td->bsrange_state);
-       srand48_r(seeds[1], &td->verify_state);
-       srand48_r(seeds[2], &td->rwmix_state);
+       os_random_seed(seeds[0], &td->bsrange_state);
+       os_random_seed(seeds[1], &td->verify_state);
+       os_random_seed(seeds[2], &td->rwmix_state);
 
        if (td->sequential)
                return 0;
@@ -321,7 +275,7 @@ int init_random_state(struct thread_data *td)
        td->num_maps = num_maps;
        memset(td->file_map, 0, num_maps * sizeof(long));
 
-       srand48_r(seeds[3], &td->random_state);
+       os_random_seed(seeds[3], &td->random_state);
        return 0;
 }
 
@@ -716,12 +670,14 @@ int parse_jobs_ini(char *file)
                                fprintf(stderr, "io priorities not available\n");
                                ret = 1;
                                break;
-#endif
+#else
                                td->ioprio |= prioclass << IOPRIO_CLASS_SHIFT;
                                fgetpos(f, &off);
                                continue;
+#endif
                        }
-                       if (!check_int(p, "direct", &td->odirect)) {
+                       if (!check_int(p, "direct", &il)) {
+                               td->odirect = il;
                                fgetpos(f, &off);
                                continue;
                        }
@@ -764,7 +720,8 @@ int parse_jobs_ini(char *file)
                                fgetpos(f, &off);
                                continue;
                        }
-                       if (!check_int(p, "invalidate",&td->invalidate_cache)) {
+                       if (!check_int(p, "invalidate", &il)) {
+                               td->invalidate_cache = il;
                                fgetpos(f, &off);
                                continue;
                        }
@@ -772,7 +729,8 @@ int parse_jobs_ini(char *file)
                                fgetpos(f, &off);
                                continue;
                        }
-                       if (!check_int(p, "sync", &td->sync_io)) {
+                       if (!check_int(p, "sync", &il)) {
+                               td->sync_io = il;
                                fgetpos(f, &off);
                                continue;
                        }
@@ -780,15 +738,18 @@ int parse_jobs_ini(char *file)
                                fgetpos(f, &off);
                                continue;
                        }
-                       if (!check_int(p, "create_serialize", &td->create_serialize)) {
+                       if (!check_int(p, "create_serialize", &il)) {
+                               td->create_serialize = il;
                                fgetpos(f, &off);
                                continue;
                        }
-                       if (!check_int(p, "create_fsync", &td->create_fsync)) {
+                       if (!check_int(p, "create_fsync", &il)) {
+                               td->create_fsync = il;
                                fgetpos(f, &off);
                                continue;
                        }
-                       if (!check_int(p, "end_fsync", &td->end_fsync)) {
+                       if (!check_int(p, "end_fsync", &il)) {
+                               td->end_fsync = il;
                                fgetpos(f, &off);
                                continue;
                        }
@@ -800,7 +761,8 @@ int parse_jobs_ini(char *file)
                                fgetpos(f, &off);
                                continue;
                        }
-                       if (!check_int(p, "overwrite", &td->overwrite)) {
+                       if (!check_int(p, "overwrite", &il)) {
+                               td->overwrite = il;
                                fgetpos(f, &off);
                                continue;
                        }
@@ -909,16 +871,22 @@ int parse_jobs_ini(char *file)
                                continue;
                        }
                        if (!check_strstore(p, "iolog", tmpbuf)) {
+                               if (td->write_iolog) {
+                                       fprintf(stderr, "fio: read iolog overrides given write_iolog\n");
+                                       free(td->iolog_file);
+                                       td->write_iolog = 0;
+                               }
                                td->iolog_file = strdup(tmpbuf);
                                td->read_iolog = 1;
-                               td->write_iolog = 0;
                                fgetpos(f, &off);
                                continue;
                        }
-                       if (!td->read_iolog &&
-                           !check_strstore(p, "write_iolog", tmpbuf)) {
-                               td->iolog_file = strdup(tmpbuf);
-                               td->write_iolog = 1;
+                       if (!check_strstore(p, "write_iolog", tmpbuf)) {
+                               if (!td->read_iolog) {
+                                       td->iolog_file = strdup(tmpbuf);
+                                       td->write_iolog = 1;
+                               } else
+                                       fprintf(stderr, "fio: read iolog overrides given write_iolog\n");
                                fgetpos(f, &off);
                                continue;
                        }
@@ -933,9 +901,15 @@ int parse_jobs_ini(char *file)
                                continue;
                        }
                        if (!check_strstore(p, "ioscheduler", tmpbuf)) {
+#ifndef FIO_HAVE_IOSCHED_SWITCH
+                               fprintf(stderr, "io scheduler switching not available\n");
+                               ret = 1;
+                               break;
+#else
                                td->ioscheduler = strdup(tmpbuf);
                                fgetpos(f, &off);
                                continue;
+#endif
                        }
 
                        /*