X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=backend.c;h=52791040ff21384d283b2a09de3ff9718e19d866;hb=c2cb68696255a8fda93043a1f2219b60af614549;hp=e567ad5e1e8e4f0f78986c26ba6550013116a7e6;hpb=4e87c37a06b96c4ed1f941eb91ec25e839c68d21;p=fio.git diff --git a/backend.c b/backend.c index e567ad5e..52791040 100644 --- a/backend.c +++ b/backend.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -67,7 +68,7 @@ int temp_stall_ts; unsigned long done_secs = 0; #define PAGE_ALIGN(buf) \ - (char *) (((unsigned long) (buf) + page_mask) & ~page_mask) + (char *) (((uintptr_t) (buf) + page_mask) & ~page_mask) #define JOB_START_TIMEOUT (5 * 1000) @@ -408,6 +409,9 @@ static void do_verify(struct thread_data *td) } } + if (flow_threshold_exceeded(td)) + continue; + io_u = __get_io_u(td); if (!io_u) break; @@ -559,6 +563,9 @@ static void do_io(struct thread_data *td) } } + if (flow_threshold_exceeded(td)) + continue; + io_u = get_io_u(td); if (!io_u) break; @@ -1019,7 +1026,8 @@ static void *thread_main(void *data) if (td->o.cgroup_weight && cgroup_setup(td, cgroup_list, &cgroup_mnt)) goto err; - if (nice(td->o.nice) == -1) { + errno = 0; + if (nice(td->o.nice) == -1 && errno != 0) { td_verror(td, errno, "nice"); goto err; } @@ -1178,7 +1186,7 @@ err: write_iolog_close(td); td_set_runstate(td, TD_EXITED); - return (void *) (unsigned long) td->error; + return (void *) (uintptr_t) td->error; } @@ -1209,7 +1217,7 @@ static int fork_main(int shmid, int offset) td = data + offset * sizeof(struct thread_data); ret = thread_main(td); shmdt(data); - return (int) (unsigned long) ret; + return (int) (uintptr_t) ret; } /*