projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Pretty up stat output
[fio.git]
/
fio.c
diff --git
a/fio.c
b/fio.c
index 4c761c038bd170f16d0d10c094c69e96f7fa503f..9c970333bb4090644fb32fec4ef9010a45214628 100644
(file)
--- a/
fio.c
+++ b/
fio.c
@@
-26,20
+26,19
@@
#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 "os.h"
#include <sys/mman.h>
#include "fio.h"
#include "os.h"
-#define MASK (4095)
-
-
#define ALIGN(buf) (char *) (((unsigned long) (buf) + MASK) & ~(MASK)
)
+static unsigned long page_mask;
+#define ALIGN(buf) \
+
(char *) (((unsigned long) (buf) + page_mask) & ~page_mask
)
int groupid = 0;
int thread_number = 0;
int groupid = 0;
int thread_number = 0;
@@
-82,11
+81,6
@@
static void sig_handler(int sig)
disk_util_timer_arm();
print_thread_status();
break;
disk_util_timer_arm();
print_thread_status();
break;
- case SIGSEGV:
- fprintf(stderr, "fio: got segfault, aborting\n");
- terminate_threads(TERMINATE_ALL, 1);
- fio_abort = 1;
- exit(0);
default:
printf("\nfio: terminating on signal %d\n", sig);
fflush(stdout);
default:
printf("\nfio: terminating on signal %d\n", sig);
fflush(stdout);
@@
-406,11
+400,22
@@
static void do_io(struct thread_data *td)
memcpy(&s, &io_u->start_time, sizeof(s));
memcpy(&s, &io_u->start_time, sizeof(s));
+requeue:
ret = td_io_queue(td, io_u);
if (ret) {
ret = td_io_queue(td, io_u);
if (ret) {
- td_verror(td, io_u->error);
- put_io_u(td, io_u);
- break;
+ if (ret > 0 && (io_u->xfer_buflen != io_u->resid) &&
+ io_u->resid) {
+ /*
+ * short read/write. requeue.
+ */
+ io_u->xfer_buflen = io_u->resid;
+ io_u->xfer_buf += ret;
+ goto requeue;
+ } else {
+ td_verror(td, io_u->error);
+ put_io_u(td, io_u);
+ break;
+ }
}
add_slat_sample(td, io_u->ddir, mtime_since(&io_u->start_time, &io_u->issue_time));
}
add_slat_sample(td, io_u->ddir, mtime_since(&io_u->start_time, &io_u->issue_time));
@@
-528,7
+533,7
@@
static int init_io_u(struct thread_data *td)
if (td->mem_type == MEM_SHMHUGE || td->mem_type == MEM_MMAPHUGE)
td->orig_buffer_size = (td->orig_buffer_size + td->hugepage_size - 1) & ~(td->hugepage_size - 1);
else
if (td->mem_type == MEM_SHMHUGE || td->mem_type == MEM_MMAPHUGE)
td->orig_buffer_size = (td->orig_buffer_size + td->hugepage_size - 1) & ~(td->hugepage_size - 1);
else
- td->orig_buffer_size +=
MASK
;
+ td->orig_buffer_size +=
page_mask
;
if (allocate_io_mem(td))
return 1;
if (allocate_io_mem(td))
return 1;
@@
-647,9
+652,6
@@
static void *thread_main(void *data)
goto err;
}
goto err;
}
- if (td_io_init(td))
- goto err;
-
if (init_iolog(td))
goto err;
if (init_iolog(td))
goto err;
@@
-680,8
+682,17
@@
static void *thread_main(void *data)
if (open_files(td))
goto err;
if (open_files(td))
goto err;
- if (td->exec_prerun)
- system(td->exec_prerun);
+ /*
+ * Do this late, as some IO engines would like to have the
+ * files setup prior to initializing structures.
+ */
+ if (td_io_init(td))
+ goto err;
+
+ 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);
@@
-736,8
+747,10
@@
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);
if (exitall_on_terminate)
terminate_threads(td->groupid, 0);
@@
-837,7
+850,6
@@
static void run_threads(void)
signal(SIGINT, sig_handler);
signal(SIGALRM, sig_handler);
signal(SIGINT, sig_handler);
signal(SIGALRM, sig_handler);
- signal(SIGSEGV, sig_handler);
todo = thread_number;
nr_running = 0;
todo = thread_number;
nr_running = 0;
@@
-992,6
+1004,15
@@
static void run_threads(void)
int main(int argc, char *argv[])
{
int main(int argc, char *argv[])
{
+ 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;
@@
-1000,6
+1021,14
@@
int main(int argc, char *argv[])
return 1;
}
return 1;
}
+ ps = sysconf(_SC_PAGESIZE);
+ if (ps < 0) {
+ log_err("Failed to get page size\n");
+ return 1;
+ }
+
+ page_mask = ps - 1;
+
if (write_bw_log) {
setup_log(&agg_io_log[DDIR_READ]);
setup_log(&agg_io_log[DDIR_WRITE]);
if (write_bw_log) {
setup_log(&agg_io_log[DDIR_READ]);
setup_log(&agg_io_log[DDIR_WRITE]);