[PATCH] Add support for specifying job nice value with nice=x

[fio.git] / fio.c

diff --git a/fio.c b/fio.c
index 864bcb451d6c2e9cda0292669f7effb0696d1c6a..571971d381d32bb2dbd72845c7c35b4fe6485805 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -197,7 +197,7 @@ static int get_next_free_block(struct thread_data *td, unsigned long long *b)
 
 static void mark_random_map(struct thread_data *td, struct io_u *io_u)
 {
-       unsigned long block = io_u->offset / td->min_bs;
+       unsigned long long block = io_u->offset / (unsigned long long) td->min_bs;
        unsigned int blocks = 0;
 
        while (blocks < (io_u->buflen / td->min_bs)) {
@@ -545,44 +545,32 @@ static void fill_md5(struct verify_header *hdr, void *p, unsigned int len)
        memcpy(hdr->md5_digest, md5_ctx.hash, sizeof(md5_ctx.hash));
 }
 
-unsigned int hweight32(unsigned int w)
-{
-       unsigned int res = w - ((w >> 1) & 0x55555555);
-
-       res = (res & 0x33333333) + ((res >> 2) & 0x33333333);
-       res = (res + (res >> 4)) & 0x0F0F0F0F;
-       res = res + (res >> 8);
-
-       return (res + (res >> 16)) & 0x000000FF;
-}
-
-unsigned long hweight64(unsigned long long w)
+static int get_rw_ddir(struct thread_data *td)
 {
-#if __WORDSIZE == 32
-        return hweight32((unsigned int)(w >> 32)) + hweight32((unsigned int)w);
-#elif __WORDSIZE == 64
-       unsigned long long v = w - ((w >> 1) & 0x5555555555555555ul);
+       if (td_rw(td)) {
+               struct timeval now;
+               unsigned long elapsed;
 
-       v = (v & 0x3333333333333333ul) + ((v >> 2) & 0x3333333333333333ul);
-       v = (v + (v >> 4)) & 0x0F0F0F0F0F0F0F0Ful;
-       v = v + (v >> 8);
-       v = v + (v >> 16);
+               gettimeofday(&now, NULL);
+               elapsed = mtime_since_now(&td->rwmix_switch);
 
-       return (v + (v >> 32)) & 0x00000000000000FFul;
-#else
-#error __WORDSIZE not defined
-#endif
-}
+               /*
+                * Check if it's time to seed a new data direction.
+                */
+               if (elapsed >= td->rwmixcycle) {
+                       unsigned long v;
+                       long r;
 
-static int get_rw_ddir(struct thread_data *td)
-{
-       /*
-        * perhaps cheasy, but use the hamming weight of the position
-        * as a randomizer for data direction.
-        */
-       if (td_rw(td))
-               return hweight64(td->last_pos) & 1;
-       else if (td_read(td))
+                       lrand48_r(&td->random_state, &r);
+                       v = 100UL * r / (unsigned long) (RAND_MAX + 1.0);
+                       if (v < td->rwmixread)
+                               td->rwmix_ddir = DDIR_READ;
+                       else
+                               td->rwmix_ddir = DDIR_WRITE;
+                       memcpy(&td->rwmix_switch, &now, sizeof(now));
+               }
+               return td->rwmix_ddir;
+       } else if (td_read(td))
                return DDIR_READ;
        else
                return DDIR_WRITE;
@@ -1798,7 +1786,6 @@ static void update_rusage_stat(struct thread_data *td)
 static void *thread_main(void *data)
 {
        struct thread_data *td = data;
-       int ret = 1;
 
        if (!td->use_thread)
                setsid();
@@ -1831,6 +1818,11 @@ static void *thread_main(void *data)
                }
        }
 
+       if (nice(td->nice) < 0) {
+               td_verror(td, errno);
+               goto err;
+       }
+
        if (init_random_state(td))
                goto err;
 
@@ -1879,8 +1871,6 @@ static void *thread_main(void *data)
                        break;
        }
 
-       ret = 0;
-
        if (td->bw_log)
                finish_log(td, td->bw_log, "bw");
        if (td->slat_log)
@@ -1900,10 +1890,6 @@ err:
                munmap(td->mmap, td->file_size);
        cleanup_io(td);
        cleanup_io_u(td);
-       if (ret) {
-               sem_post(&startup_sem);
-               sem_wait(&td->mutex);
-       }
        td_set_runstate(td, TD_EXITED);
        return NULL;
 
@@ -1950,14 +1936,15 @@ static void show_ddir_status(struct thread_data *td, struct group_run_stats *rs,
                             int ddir)
 {
        char *ddir_str[] = { "read ", "write" };
-       unsigned long min, max, bw;
+       unsigned long min, max;
+       unsigned long long bw;
        double mean, dev;
 
        if (!td->runtime[ddir])
                return;
 
        bw = td->io_bytes[ddir] / td->runtime[ddir];
-       printf("  %s: io=%6lluMiB, bw=%6luKiB/s, runt=%6lumsec\n", ddir_str[ddir], td->io_bytes[ddir] >> 20, bw, td->runtime[ddir]);
+       printf("  %s: io=%6lluMiB, bw=%6lluKiB/s, runt=%6lumsec\n", ddir_str[ddir], td->io_bytes[ddir] >> 20, bw, td->runtime[ddir]);
 
        if (calc_lat(&td->slat_stat[ddir], &min, &max, &mean, &dev))
                printf("    slat (msec): min=%5lu, max=%5lu, avg=%5.02f, dev=%5.02f\n", min, max, mean, dev);
@@ -2397,11 +2384,14 @@ static void run_threads(void)
                                td = map[i];
                                if (!td)
                                        continue;
-                               if (td->runstate == TD_INITIALIZED ||
-                                   td->runstate >= TD_EXITED) {
+                               if (td->runstate == TD_INITIALIZED) {
                                        map[i] = NULL;
                                        left--;
-                                       continue;
+                               } else if (td->runstate >= TD_EXITED) {
+                                       map[i] = NULL;
+                                       left--;
+                                       todo--;
+                                       nr_running++; /* work-around... */
                                }
                        }
                }
@@ -2418,7 +2408,7 @@ static void run_threads(void)
                }
 
                /*
-                * start created threads (TD_INITIALIZED -> TD_RUNNING)
+                * start created threads (TD_INITIALIZED -> TD_RUNNING).
                 */
                printf("fio: Go for launch\n");
                for (i = 0; i < thread_number; i++) {
@@ -2499,7 +2489,7 @@ static void show_run_stats(void)
        }
 
        for (i = 0; i < thread_number; i++) {
-               unsigned long rbw, wbw;
+               unsigned long long rbw, wbw;
 
                td = &threads[i];
 
@@ -2521,9 +2511,9 @@ static void show_run_stats(void)
 
                rbw = wbw = 0;
                if (td->runtime[0])
-                       rbw = td->io_bytes[0] / td->runtime[0];
+                       rbw = td->io_bytes[0] / (unsigned long long) td->runtime[0];
                if (td->runtime[1])
-                       wbw = td->io_bytes[1] / td->runtime[1];
+                       wbw = td->io_bytes[1] / (unsigned long long) td->runtime[1];
 
                if (rbw < rs->min_bw[0])
                        rs->min_bw[0] = rbw;