[PATCH] Add ioscheduler=x option to allow setting io scheduler

[fio.git] / fio.c

diff --git a/fio.c b/fio.c
index 82a18fb89f4d05c8b8f2821e0cbaf82b677dc75b..bd938979f61caa3f59152d50c4eee03b24b84c53 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -1787,9 +1787,58 @@ static void init_disk_util(struct thread_data *td)
                sprintf(foo, "%s", p);
        }
 
+       td->sysfs_root = strdup(foo);
        disk_util_add(dev, foo);
 }
 
+static int switch_ioscheduler(struct thread_data *td)
+{
+       char tmp[256], tmp2[128];
+       FILE *f;
+       int ret;
+
+       sprintf(tmp, "%s/queue/scheduler", td->sysfs_root);
+
+       f = fopen(tmp, "r+");
+       if (!f) {
+               td_verror(td, errno);
+               return 1;
+       }
+
+       /*
+        * Set io scheduler.
+        */
+       ret = fwrite(td->ioscheduler, strlen(td->ioscheduler), 1, f);
+       if (ferror(f) || ret != 1) {
+               td_verror(td, errno);
+               fclose(f);
+               return 1;
+       }
+
+       rewind(f);
+
+       /*
+        * Read back and check that the selected scheduler is now the default.
+        */
+       ret = fread(tmp, 1, sizeof(tmp), f);
+       if (ferror(f) || ret < 0) {
+               td_verror(td, errno);
+               fclose(f);
+               return 1;
+       }
+
+       sprintf(tmp2, "[%s]", td->ioscheduler);
+       if (!strstr(tmp, tmp2)) {
+               fprintf(stderr, "fio: io scheduler %s not found\n", td->ioscheduler);
+               td_verror(td, EINVAL);
+               fclose(f);
+               return 1;
+       }
+
+       fclose(f);
+       return 0;
+}
+
 static void disk_util_timer_arm(void)
 {
        itimer.it_value.tv_sec = 0;
@@ -1869,6 +1918,9 @@ static void *thread_main(void *data)
        if (init_random_state(td))
                goto err;
 
+       if (td->ioscheduler && switch_ioscheduler(td))
+               goto err;
+
        td_set_runstate(td, TD_INITIALIZED);
        sem_post(&startup_sem);
        sem_wait(&td->mutex);
@@ -1878,6 +1930,9 @@ static void *thread_main(void *data)
 
        gettimeofday(&td->epoch, NULL);
 
+       if (td->exec_prerun)
+               system(td->exec_prerun);
+
        while (td->loops--) {
                getrusage(RUSAGE_SELF, &td->ru_start);
                gettimeofday(&td->start, NULL);
@@ -1922,6 +1977,8 @@ static void *thread_main(void *data)
                finish_log(td, td->clat_log, "clat");
        if (td->write_iolog)
                write_iolog_close(td);
+       if (td->exec_postrun)
+               system(td->exec_postrun);
 
        if (exitall_on_terminate)
                terminate_threads(td->groupid);
@@ -1937,6 +1994,14 @@ err:
                free(td->directory);
        if (td->iolog_file)
                free(td->iolog_file);
+       if (td->exec_prerun)
+               free(td->exec_prerun);
+       if (td->exec_postrun)
+               free(td->exec_postrun);
+       if (td->ioscheduler)
+               free(td->ioscheduler);
+       if (td->sysfs_root)
+               free(td->sysfs_root);
        cleanup_io(td);
        cleanup_io_u(td);
        td_set_runstate(td, TD_EXITED);