projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'samples-colnames' of https://github.com/parallel-fs-utils/fio
[fio.git]
/
backend.c
diff --git
a/backend.c
b/backend.c
index 36bde6a587535635ee9d1dcef6c0bc0c5160f772..cc3c4e78e9d8ae6b8fd9cdc245272fc395369f34 100644
(file)
--- a/
backend.c
+++ b/
backend.c
@@
-29,6
+29,7
@@
#include <sys/stat.h>
#include <sys/wait.h>
#include <math.h>
#include <sys/stat.h>
#include <sys/wait.h>
#include <math.h>
+#include <pthread.h>
#include "fio.h"
#include "smalloc.h"
#include "fio.h"
#include "smalloc.h"
@@
-53,7
+54,7
@@
static struct fio_sem *startup_sem;
static struct flist_head *cgroup_list;
static struct cgroup_mnt *cgroup_mnt;
static int exit_value;
static struct flist_head *cgroup_list;
static struct cgroup_mnt *cgroup_mnt;
static int exit_value;
-static volatile
int
fio_abort;
+static volatile
bool
fio_abort;
static unsigned int nr_process = 0;
static unsigned int nr_thread = 0;
static unsigned int nr_process = 0;
static unsigned int nr_thread = 0;
@@
-65,6
+66,7
@@
unsigned int stat_number = 0;
int shm_id = 0;
int temp_stall_ts;
unsigned long done_secs = 0;
int shm_id = 0;
int temp_stall_ts;
unsigned long done_secs = 0;
+pthread_mutex_t overlap_check = PTHREAD_MUTEX_INITIALIZER;
#define JOB_START_TIMEOUT (5 * 1000)
#define JOB_START_TIMEOUT (5 * 1000)
@@
-567,7
+569,7
@@
static int unlink_all_files(struct thread_data *td)
/*
* Check if io_u will overlap an in-flight IO in the queue
*/
/*
* Check if io_u will overlap an in-flight IO in the queue
*/
-
static
bool in_flight_overlap(struct io_u_queue *q, struct io_u *io_u)
+bool in_flight_overlap(struct io_u_queue *q, struct io_u *io_u)
{
bool overlap;
struct io_u *check_io_u;
{
bool overlap;
struct io_u *check_io_u;
@@
-1872,7
+1874,11
@@
static void *thread_main(void *data)
"perhaps try --debug=io option for details?\n",
td->o.name, td->io_ops->name);
"perhaps try --debug=io option for details?\n",
td->o.name, td->io_ops->name);
+ if (td->o.serialize_overlap && td->o.io_submit_mode == IO_MODE_OFFLOAD)
+ pthread_mutex_lock(&overlap_check);
td_set_runstate(td, TD_FINISHING);
td_set_runstate(td, TD_FINISHING);
+ if (td->o.serialize_overlap && td->o.io_submit_mode == IO_MODE_OFFLOAD)
+ pthread_mutex_unlock(&overlap_check);
update_rusage_stat(td);
td->ts.total_run_time = mtime_since_now(&td->epoch);
update_rusage_stat(td);
td->ts.total_run_time = mtime_since_now(&td->epoch);
@@
-2213,18
+2219,22
@@
static void run_threads(struct sk_out *sk_out)
}
if (output_format & FIO_OUTPUT_NORMAL) {
}
if (output_format & FIO_OUTPUT_NORMAL) {
- log_info("Starting ");
+ struct buf_output out;
+
+ buf_output_init(&out);
+ __log_buf(&out, "Starting ");
if (nr_thread)
if (nr_thread)
-
log_info(
"%d thread%s", nr_thread,
+
__log_buf(&out,
"%d thread%s", nr_thread,
nr_thread > 1 ? "s" : "");
if (nr_process) {
if (nr_thread)
nr_thread > 1 ? "s" : "");
if (nr_process) {
if (nr_thread)
-
log_info(
" and ");
-
log_info(
"%d process%s", nr_process,
+
__log_buf(&out,
" and ");
+
__log_buf(&out,
"%d process%s", nr_process,
nr_process > 1 ? "es" : "");
}
nr_process > 1 ? "es" : "");
}
- log_info("\n");
- log_info_flush();
+ __log_buf(&out, "\n");
+ log_info_buf(out.buf, out.buflen);
+ buf_output_free(&out);
}
todo = thread_number;
}
todo = thread_number;
@@
-2367,7
+2377,7
@@
reap:
if (fio_sem_down_timeout(startup_sem, 10000)) {
log_err("fio: job startup hung? exiting.\n");
fio_terminate_threads(TERMINATE_ALL);
if (fio_sem_down_timeout(startup_sem, 10000)) {
log_err("fio: job startup hung? exiting.\n");
fio_terminate_threads(TERMINATE_ALL);
- fio_abort =
1
;
+ fio_abort =
true
;
nr_started--;
free(fd);
break;
nr_started--;
free(fd);
break;
@@
-2481,6
+2491,8
@@
int fio_backend(struct sk_out *sk_out)
}
startup_sem = fio_sem_init(FIO_SEM_LOCKED);
}
startup_sem = fio_sem_init(FIO_SEM_LOCKED);
+ if (!sk_out)
+ is_local_backend = true;
if (startup_sem == NULL)
return 1;
if (startup_sem == NULL)
return 1;