projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into gfio
[fio.git]
/
backend.c
diff --git
a/backend.c
b/backend.c
index 9cc8dbc3ce1e029b4729e23e150428e4217b60e4..dcc6fba06fdb58636555cdd1db13d5113cab9b21 100644
(file)
--- a/
backend.c
+++ b/
backend.c
@@
-57,13
+57,13
@@
static struct flist_head *cgroup_list;
static char *cgroup_mnt;
static int exit_value;
static volatile int fio_abort;
static char *cgroup_mnt;
static int exit_value;
static volatile int fio_abort;
+static unsigned int nr_process = 0;
+static unsigned int nr_thread = 0;
struct io_log *agg_io_log[2];
int groupid = 0;
unsigned int thread_number = 0;
struct io_log *agg_io_log[2];
int groupid = 0;
unsigned int thread_number = 0;
-unsigned int nr_process = 0;
-unsigned int nr_thread = 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;
@@
-346,8
+346,8
@@
static int break_on_this_error(struct thread_data *td, enum fio_ddir ddir,
return 1;
if (td_non_fatal_error(err)) {
return 1;
if (td_non_fatal_error(err)) {
- /*
- * Continue with the I/Os in case of
+ /*
+ * Continue with the I/Os in case of
* a non fatal error.
*/
update_error_count(td, err);
* a non fatal error.
*/
update_error_count(td, err);
@@
-969,10
+969,12
@@
static void *thread_main(void *data)
{
unsigned long long elapsed;
struct thread_data *td = data;
{
unsigned long long elapsed;
struct thread_data *td = data;
+ struct thread_options *o = &td->o;
pthread_condattr_t attr;
int clear_state;
pthread_condattr_t attr;
int clear_state;
+ int ret;
- if (!
td->o.
use_thread) {
+ if (!
o->
use_thread) {
setsid();
td->pid = getpid();
} else
setsid();
td->pid = getpid();
} else
@@
-980,6
+982,9
@@
static void *thread_main(void *data)
dprint(FD_PROCESS, "jobs pid=%d started\n", (int) td->pid);
dprint(FD_PROCESS, "jobs pid=%d started\n", (int) td->pid);
+ if (is_backend)
+ fio_server_send_start(td);
+
INIT_FLIST_HEAD(&td->io_u_freelist);
INIT_FLIST_HEAD(&td->io_u_busylist);
INIT_FLIST_HEAD(&td->io_u_requeues);
INIT_FLIST_HEAD(&td->io_u_freelist);
INIT_FLIST_HEAD(&td->io_u_busylist);
INIT_FLIST_HEAD(&td->io_u_requeues);
@@
-1006,16
+1011,17
@@
static void *thread_main(void *data)
* eating a file descriptor
*/
fio_mutex_remove(td->mutex);
* eating a file descriptor
*/
fio_mutex_remove(td->mutex);
+ td->mutex = NULL;
/*
* A new gid requires privilege, so we need to do this before setting
* the uid.
*/
/*
* A new gid requires privilege, so we need to do this before setting
* the uid.
*/
- if (
td->o.gid != -1U && setgid(td->o.
gid)) {
+ if (
o->gid != -1U && setgid(o->
gid)) {
td_verror(td, errno, "setgid");
goto err;
}
td_verror(td, errno, "setgid");
goto err;
}
- if (
td->o.uid != -1U && setuid(td->o.
uid)) {
+ if (
o->uid != -1U && setuid(o->
uid)) {
td_verror(td, errno, "setuid");
goto err;
}
td_verror(td, errno, "setuid");
goto err;
}
@@
-1024,18
+1030,24
@@
static void *thread_main(void *data)
* If we have a gettimeofday() thread, make sure we exclude that
* thread from this job
*/
* If we have a gettimeofday() thread, make sure we exclude that
* thread from this job
*/
- if (
td->o.
gtod_cpu)
- fio_cpu_clear(&
td->o.cpumask, td->o.
gtod_cpu);
+ if (
o->
gtod_cpu)
+ fio_cpu_clear(&
o->cpumask, o->
gtod_cpu);
/*
* Set affinity first, in case it has an impact on the memory
* allocations.
*/
/*
* Set affinity first, in case it has an impact on the memory
* allocations.
*/
- if (td->o.cpumask_set && fio_setaffinity(td->pid, td->o.cpumask) == -1) {
- td_verror(td, errno, "cpu_set_affinity");
- goto err;
+ if (o->cpumask_set) {
+ ret = fio_setaffinity(td->pid, o->cpumask);
+ if (ret == -1) {
+ td_verror(td, errno, "cpu_set_affinity");
+ goto err;
+ }
}
}
+ if (fio_pin_memory(td))
+ goto err;
+
/*
* May alter parameters that init_io_u() will use, so we need to
* do this first.
/*
* May alter parameters that init_io_u() will use, so we need to
* do this first.
@@
-1046,11
+1058,12
@@
static void *thread_main(void *data)
if (init_io_u(td))
goto err;
if (init_io_u(td))
goto err;
- if (
td->o.
verify_async && verify_async_init(td))
+ if (
o->
verify_async && verify_async_init(td))
goto err;
goto err;
- if (td->ioprio_set) {
- if (ioprio_set(IOPRIO_WHO_PROCESS, 0, td->ioprio) == -1) {
+ if (o->ioprio) {
+ ret = ioprio_set(IOPRIO_WHO_PROCESS, 0, o->ioprio_class, o->ioprio);
+ if (ret == -1) {
td_verror(td, errno, "ioprio_set");
goto err;
}
td_verror(td, errno, "ioprio_set");
goto err;
}
@@
-1060,15
+1073,15
@@
static void *thread_main(void *data)
goto err;
errno = 0;
goto err;
errno = 0;
- if (nice(
td->o.
nice) == -1 && errno != 0) {
+ if (nice(
o->
nice) == -1 && errno != 0) {
td_verror(td, errno, "nice");
goto err;
}
td_verror(td, errno, "nice");
goto err;
}
- if (
td->o.
ioscheduler && switch_ioscheduler(td))
+ if (
o->
ioscheduler && switch_ioscheduler(td))
goto err;
goto err;
- if (!
td->o.
create_serialize && setup_files(td))
+ if (!
o->
create_serialize && setup_files(td))
goto err;
if (td_io_init(td))
goto err;
if (td_io_init(td))
@@
-1077,16
+1090,16
@@
static void *thread_main(void *data)
if (init_random_map(td))
goto err;
if (init_random_map(td))
goto err;
- if (td->o.exec_prerun) {
- if (exec_string(td->o.exec_prerun))
- goto err;
- }
+ if (o->exec_prerun && exec_string(o->exec_prerun))
+ goto err;
- if (
td->o.
pre_read) {
+ if (
o->
pre_read) {
if (pre_read_files(td) < 0)
goto err;
}
if (pre_read_files(td) < 0)
goto err;
}
+ fio_verify_init(td);
+
fio_gettime(&td->epoch, NULL);
getrusage(RUSAGE_SELF, &td->ru_start);
fio_gettime(&td->epoch, NULL);
getrusage(RUSAGE_SELF, &td->ru_start);
@@
-1098,9
+1111,9
@@
static void *thread_main(void *data)
memcpy(&td->tv_cache, &td->start, sizeof(td->start));
if (td->o.ratemin[0] || td->o.ratemin[1]) {
memcpy(&td->tv_cache, &td->start, sizeof(td->start));
if (td->o.ratemin[0] || td->o.ratemin[1]) {
- memcpy(&td->lastrate[0], &td->bw_sample_time,
+ memcpy(&td->lastrate[0], &td->bw_sample_time,
sizeof(td->bw_sample_time));
sizeof(td->bw_sample_time));
- memcpy(&td->lastrate[1], &td->bw_sample_time,
+ memcpy(&td->lastrate[1], &td->bw_sample_time,
sizeof(td->bw_sample_time));
}
sizeof(td->bw_sample_time));
}
@@
-1149,6
+1162,8
@@
static void *thread_main(void *data)
td->ts.io_bytes[0] = td->io_bytes[0];
td->ts.io_bytes[1] = td->io_bytes[1];
td->ts.io_bytes[0] = td->io_bytes[0];
td->ts.io_bytes[1] = td->io_bytes[1];
+ fio_unpin_memory(td);
+
fio_mutex_down(writeout_mutex);
if (td->bw_log) {
if (td->o.bw_log_file) {
fio_mutex_down(writeout_mutex);
if (td->bw_log) {
if (td->o.bw_log_file) {
@@
-1206,8
+1221,8
@@
err:
cleanup_io_u(td);
cgroup_shutdown(td, &cgroup_mnt);
cleanup_io_u(td);
cgroup_shutdown(td, &cgroup_mnt);
- if (
td->o.
cpumask_set) {
- int ret = fio_cpuset_exit(&
td->o.
cpumask);
+ if (
o->
cpumask_set) {
+ int ret = fio_cpuset_exit(&
o->
cpumask);
td_verror(td, ret, "fio_cpuset_exit");
}
td_verror(td, ret, "fio_cpuset_exit");
}
@@
-1361,14
+1376,19
@@
static void run_threads(void)
unsigned long spent;
unsigned int i, todo, nr_running, m_rate, t_rate, nr_started;
unsigned long spent;
unsigned int i, todo, nr_running, m_rate, t_rate, nr_started;
- if (fio_pin_memory())
- return;
-
if (fio_gtod_offload && fio_start_gtod_thread())
return;
set_sig_handlers();
if (fio_gtod_offload && fio_start_gtod_thread())
return;
set_sig_handlers();
+ nr_thread = nr_process = 0;
+ for_each_td(td, i) {
+ if (td->o.use_thread)
+ nr_thread++;
+ else
+ nr_process++;
+ }
+
if (!terse_output) {
log_info("Starting ");
if (nr_thread)
if (!terse_output) {
log_info("Starting ");
if (nr_thread)
@@
-1568,25
+1588,16
@@
static void run_threads(void)
reap_threads(&nr_running, &t_rate, &m_rate);
reap_threads(&nr_running, &t_rate, &m_rate);
- if (todo) {
- if (is_backend)
- fio_server_idle_loop();
- else
- usleep(100000);
- }
+ if (todo)
+ usleep(100000);
}
while (nr_running) {
reap_threads(&nr_running, &t_rate, &m_rate);
}
while (nr_running) {
reap_threads(&nr_running, &t_rate, &m_rate);
-
- if (is_backend)
- fio_server_idle_loop();
- else
- usleep(10000);
+ usleep(10000);
}
update_io_ticks();
}
update_io_ticks();
- fio_unpin_memory();
}
void wait_for_disk_thread_exit(void)
}
void wait_for_disk_thread_exit(void)
@@
-1657,8
+1668,8
@@
int fio_backend(void)
return 0;
if (write_bw_log) {
return 0;
if (write_bw_log) {
- setup_log(&agg_io_log[DDIR_READ], 0);
- setup_log(&agg_io_log[DDIR_WRITE], 0);
+ setup_log(&agg_io_log[DDIR_READ], 0
, IO_LOG_TYPE_BW
);
+ setup_log(&agg_io_log[DDIR_WRITE], 0
, IO_LOG_TYPE_BW
);
}
startup_mutex = fio_mutex_init(0);
}
startup_mutex = fio_mutex_init(0);