#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;
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);
memcpy(&s, &io_u->start_time, sizeof(s));
+requeue:
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));
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 (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);
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);
signal(SIGINT, sig_handler);
signal(SIGALRM, sig_handler);
- signal(SIGSEGV, sig_handler);
todo = thread_number;
nr_running = 0;
int main(int argc, char *argv[])
{
+ long ps;
+
if (parse_options(argc, 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]);