X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=7e327887bfcc3bedc16110becb14b0a8c4dd02fd;hp=df4fbb16da9d4ab7dec15870c3e6826d50c329dc;hb=7a3b2fc3434985fa519db55e8f81734c24af274d;hpb=4d384589772a50924c68261086feae594020395e diff --git a/fio.h b/fio.h index df4fbb16..7e327887 100644 --- a/fio.h +++ b/fio.h @@ -269,10 +269,10 @@ struct thread_data { * Rate state */ uint64_t rate_bps[DDIR_RWDIR_CNT]; - unsigned long rate_next_io_time[DDIR_RWDIR_CNT]; + uint64_t rate_next_io_time[DDIR_RWDIR_CNT]; unsigned long rate_bytes[DDIR_RWDIR_CNT]; unsigned long rate_blocks[DDIR_RWDIR_CNT]; - unsigned long rate_io_issue_bytes[DDIR_RWDIR_CNT]; + unsigned long long rate_io_issue_bytes[DDIR_RWDIR_CNT]; struct timeval lastrate[DDIR_RWDIR_CNT]; int64_t last_usec; struct frand_state poisson_state; @@ -476,7 +476,7 @@ static inline void fio_ro_check(const struct thread_data *td, struct io_u *io_u) assert(!(io_u->ddir == DDIR_WRITE && !td_write(td))); } -#define REAL_MAX_JOBS 2048 +#define REAL_MAX_JOBS 4096 static inline int should_fsync(struct thread_data *td) { @@ -588,7 +588,7 @@ extern const char *runstate_to_name(int runstate); * Allow 60 seconds for a job to quit on its own, otherwise reap with * a vengeance. */ -#define FIO_REAP_TIMEOUT 60 +#define FIO_REAP_TIMEOUT 300 #define TERMINATE_ALL (-1U) extern void fio_terminate_threads(unsigned int);