projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
server: start conversion of data structures to network friendly types
[fio.git]
/
fio.c
diff --git
a/fio.c
b/fio.c
index 5e4d0e60244ac3c2e6d73ae1c3858eafead8d760..762303e5793447808efe36dc0553043b17d6b3af 100644
(file)
--- a/
fio.c
+++ b/
fio.c
@@
-46,6
+46,7
@@
#include "profile.h"
#include "lib/rand.h"
#include "memalign.h"
#include "profile.h"
#include "lib/rand.h"
#include "memalign.h"
+#include "server.h"
unsigned long page_mask;
unsigned long page_size;
unsigned long page_mask;
unsigned long page_size;
@@
-122,6
+123,7
@@
static void sig_int(int sig)
{
if (threads) {
log_info("\nfio: terminating on signal %d\n", sig);
{
if (threads) {
log_info("\nfio: terminating on signal %d\n", sig);
+ exit_backend = 1;
fflush(stdout);
exit_value = 128;
terminate_threads(TERMINATE_ALL);
fflush(stdout);
exit_value = 128;
terminate_threads(TERMINATE_ALL);
@@
-137,9
+139,7
@@
static void *disk_thread_main(void *data)
if (!threads)
break;
update_io_ticks();
if (!threads)
break;
update_io_ticks();
-
- if (!is_backend)
- print_thread_status();
+ print_thread_status();
}
return NULL;
}
return NULL;
@@
-1230,33
+1230,33
@@
static void *thread_main(void *data)
td->ts.io_bytes[1] = td->io_bytes[1];
fio_mutex_down(writeout_mutex);
td->ts.io_bytes[1] = td->io_bytes[1];
fio_mutex_down(writeout_mutex);
- if (td->
ts.
bw_log) {
+ if (td->bw_log) {
if (td->o.bw_log_file) {
if (td->o.bw_log_file) {
- finish_log_named(td, td->
ts.
bw_log,
+ finish_log_named(td, td->bw_log,
td->o.bw_log_file, "bw");
} else
td->o.bw_log_file, "bw");
} else
- finish_log(td, td->
ts.
bw_log, "bw");
+ finish_log(td, td->bw_log, "bw");
}
}
- if (td->
ts.
lat_log) {
+ if (td->lat_log) {
if (td->o.lat_log_file) {
if (td->o.lat_log_file) {
- finish_log_named(td, td->
ts.
lat_log,
+ finish_log_named(td, td->lat_log,
td->o.lat_log_file, "lat");
} else
td->o.lat_log_file, "lat");
} else
- finish_log(td, td->
ts.
lat_log, "lat");
+ finish_log(td, td->lat_log, "lat");
}
}
- if (td->
ts.
slat_log) {
+ if (td->slat_log) {
if (td->o.lat_log_file) {
if (td->o.lat_log_file) {
- finish_log_named(td, td->
ts.
slat_log,
+ finish_log_named(td, td->slat_log,
td->o.lat_log_file, "slat");
} else
td->o.lat_log_file, "slat");
} else
- finish_log(td, td->
ts.
slat_log, "slat");
+ finish_log(td, td->slat_log, "slat");
}
}
- if (td->
ts.
clat_log) {
+ if (td->clat_log) {
if (td->o.lat_log_file) {
if (td->o.lat_log_file) {
- finish_log_named(td, td->
ts.
clat_log,
+ finish_log_named(td, td->clat_log,
td->o.lat_log_file, "clat");
} else
td->o.lat_log_file, "clat");
} else
- finish_log(td, td->
ts.
clat_log, "clat");
+ finish_log(td, td->clat_log, "clat");
}
fio_mutex_up(writeout_mutex);
if (td->o.exec_postrun)
}
fio_mutex_up(writeout_mutex);
if (td->o.exec_postrun)
@@
-1694,6
+1694,8
@@
static void run_threads(void)
int exec_run(void)
{
int exec_run(void)
{
+ if (nr_clients)
+ return fio_handle_clients();
if (exec_profile && load_profile(exec_profile))
return 1;
if (exec_profile && load_profile(exec_profile))
return 1;