Recent changes (master)
The following changes since commit 04d6530f6ecd50520e99732b0b6bb90f71ff131a:
file: fix numjobs > 1 and implied jobname as filename (2016-08-25 21:00:55 -0600)
are available in the git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to 39d13e67ef1f4b327c68431f8daf033a03920117:
backend: check if we need to update rusage stats, if stat_mutex is busy (2016-08-26 14:39:30 -0600)
----------------------------------------------------------------
Jens Axboe (2):
file: fio_files_done() can return bool
backend: check if we need to update rusage stats, if stat_mutex is busy
backend.c | 8 ++++++-- file.h | 2 +- filesetup.c | 7 +++---- 3 files changed, 10 insertions(+), 7 deletions(-)
---
Diff of recent changes:
backend.c +6 -2
@@ -1731,9 +1731,13 @@ static void *thread_main(void *data)* the rusage_sem, which would never get upped because * this thread is waiting for the stat mutex. */ -check_update_rusage (td); +do { +check_update_rusage (td); +if (!fio_mutex_down_trylock (stat_mutex)) +break ; +usleep (1000 ); + }while (1 ); -fio_mutex_down (stat_mutex);if (td_read (td) && td->io_bytes[DDIR_READ ])update_runtime (td, elapsed_us,DDIR_READ );if (td_write (td) && td->io_bytes[DDIR_WRITE ])
file.h +1 -1
@@ -210,7 +210,7 @@ extern int get_fileno(struct thread_data *, const char *);extern void free_release_files (struct thread_data *);extern void filesetup_mem_free (void );extern void fio_file_reset (struct thread_data *,struct fio_file *); -extern int fio_files_done (struct thread_data *); +extern bool fio_files_done (struct thread_data *);extern bool exists_and_not_regfile (const char *);#endif
filesetup.c +3 -4
@@ -1292,7 +1292,6 @@ static void set_already_allocated(const char *fname) } } -static void free_already_allocated (void ) {struct flist_head *entry, *tmp;
@@ -1666,16 +1665,16 @@ void fio_file_reset(struct thread_data *td, struct fio_file *f)lfsr_reset (&f->lfsr, td->rand_seeds[FIO_RAND_BLOCK_OFF ]); } -int fio_files_done (struct thread_data *td) +bool fio_files_done (struct thread_data *td) {struct fio_file *f;unsigned int i;for_each_file (td, f, i)if (!fio_file_done (f)) -return 0 ; +return false; -return 1 ; +return true; }/* free memory used in initialization phase only */