projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Fix random seed for numjobs > 1
[fio.git]
/
fio.c
diff --git
a/fio.c
b/fio.c
index 355c9d4ee1b6bb0c044e921f68467f739f2ce38e..e8a86585d4bd5d4ee83cff9202eca1ef8a3a58a9 100644
(file)
--- a/
fio.c
+++ b/
fio.c
@@
-26,12
+26,11
@@
#include <string.h>
#include <signal.h>
#include <time.h>
#include <string.h>
#include <signal.h>
#include <time.h>
-#include <
assert
.h>
+#include <
locale
.h>
#include <sys/stat.h>
#include <sys/wait.h>
#include <sys/ipc.h>
#include <sys/shm.h>
#include <sys/stat.h>
#include <sys/wait.h>
#include <sys/ipc.h>
#include <sys/shm.h>
-#include <sys/ioctl.h>
#include <sys/mman.h>
#include "fio.h"
#include <sys/mman.h>
#include "fio.h"
@@
-48,6
+47,7
@@
int temp_stall_ts;
static volatile int startup_sem;
static volatile int fio_abort;
static volatile int startup_sem;
static volatile int fio_abort;
+static int exit_value;
struct io_log *agg_io_log[2];
struct io_log *agg_io_log[2];
@@
-383,7
+383,7
@@
static void do_io(struct thread_data *td)
td_set_runstate(td, TD_RUNNING);
td_set_runstate(td, TD_RUNNING);
- while (
td->this_io_bytes[td->ddir]
< td->io_size) {
+ while (
(td->this_io_bytes[0] + td->this_io_bytes[1])
< td->io_size) {
struct timespec *timeout;
int min_evts = 0;
struct io_u *io_u;
struct timespec *timeout;
int min_evts = 0;
struct io_u *io_u;
@@
-400,7
+400,6
@@
static void do_io(struct thread_data *td)
break;
memcpy(&s, &io_u->start_time, sizeof(s));
break;
memcpy(&s, &io_u->start_time, sizeof(s));
-
requeue:
ret = td_io_queue(td, io_u);
if (ret) {
requeue:
ret = td_io_queue(td, io_u);
if (ret) {
@@
-413,7
+412,6
@@
requeue:
io_u->xfer_buf += ret;
goto requeue;
} else {
io_u->xfer_buf += ret;
goto requeue;
} else {
- td_verror(td, io_u->error);
put_io_u(td, io_u);
break;
}
put_io_u(td, io_u);
break;
}
@@
-690,8
+688,10
@@
static void *thread_main(void *data)
if (td_io_init(td))
goto err;
if (td_io_init(td))
goto err;
- if (td->exec_prerun)
- system(td->exec_prerun);
+ if (td->exec_prerun) {
+ if (system(td->exec_prerun) < 0)
+ goto err;
+ }
fio_gettime(&td->epoch, NULL);
getrusage(RUSAGE_SELF, &td->ru_start);
fio_gettime(&td->epoch, NULL);
getrusage(RUSAGE_SELF, &td->ru_start);
@@
-746,19
+746,22
@@
static void *thread_main(void *data)
finish_log(td, td->clat_log, "clat");
if (td->write_iolog_file)
write_iolog_close(td);
finish_log(td, td->clat_log, "clat");
if (td->write_iolog_file)
write_iolog_close(td);
- if (td->exec_postrun)
- system(td->exec_postrun);
+ if (td->exec_postrun) {
+ if (system(td->exec_postrun) < 0)
+ log_err("fio: postrun %s failed\n", td->exec_postrun);
+ }
if (exitall_on_terminate)
terminate_threads(td->groupid, 0);
err:
if (exitall_on_terminate)
terminate_threads(td->groupid, 0);
err:
+ if (td->error)
+ printf("fio: pid=%d, err=%d/%s\n", td->pid, td->error, td->verror);
close_files(td);
close_ioengine(td);
cleanup_io_u(td);
td_set_runstate(td, TD_EXITED);
return NULL;
close_files(td);
close_ioengine(td);
cleanup_io_u(td);
td_set_runstate(td, TD_EXITED);
return NULL;
-
}
/*
}
/*
@@
-809,6
+812,9
@@
static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
continue;
}
continue;
}
+ if (td->error)
+ exit_value++;
+
td_set_runstate(td, TD_REAPED);
if (td->use_thread) {
td_set_runstate(td, TD_REAPED);
if (td->use_thread) {
@@
-867,6
+873,9
@@
static void run_threads(void)
* client data interspersed on disk
*/
if (setup_files(td)) {
* client data interspersed on disk
*/
if (setup_files(td)) {
+ exit_value++;
+ if (td->error)
+ log_err("fio: pid=%d, err=%d/%s\n", td->pid, td->error, td->verror);
td_set_runstate(td, TD_REAPED);
todo--;
}
td_set_runstate(td, TD_REAPED);
todo--;
}
@@
-1003,6
+1012,13
@@
int main(int argc, char *argv[])
{
long ps;
{
long ps;
+ /*
+ * We need locale for number printing, if it isn't set then just
+ * go with the US format.
+ */
+ if (!getenv("LC_NUMERIC"))
+ setlocale(LC_NUMERIC, "en_US");
+
if (parse_options(argc, argv))
return 1;
if (parse_options(argc, argv))
return 1;
@@
-1036,5
+1052,5
@@
int main(int argc, char *argv[])
}
}
}
}
- return
0
;
+ return
exit_value
;
}
}