return 0;
}
-static int create_file(struct thread_data *td, unsigned long long size,
- int extend)
+static int create_file(struct thread_data *td, unsigned long long size)
{
unsigned long long left;
unsigned int bs;
- int r, oflags;
char *b;
+ int r;
/*
* unless specifically asked for overwrite, let normal io extend it
*/
- if (td_write(td) && !td->overwrite)
+ if (!td->overwrite) {
+ td->real_file_size = size;
return 0;
+ }
if (!size) {
log_err("Need size for create\n");
}
temp_stall_ts = 1;
+ fprintf(f_out, "%s: Laying out IO file (%LuMiB)\n",td->name,size >> 20);
- if (!extend) {
- oflags = O_CREAT | O_TRUNC;
- fprintf(f_out, "%s: Laying out IO file (%LuMiB)\n", td->name, size >> 20);
- } else {
- oflags = O_APPEND;
- fprintf(f_out, "%s: Extending IO file (%Lu -> %LuMiB)\n", td->name, (td->file_size - size) >> 20, td->file_size >> 20);
- }
-
- td->fd = open(td->file_name, O_WRONLY | oflags, 0644);
+ td->fd = open(td->file_name, O_WRONLY | O_CREAT | O_TRUNC, 0644);
if (td->fd < 0) {
td_verror(td, errno);
- temp_stall_ts = 0;
- return 1;
+ goto done_noclose;
}
- if (!extend && ftruncate(td->fd, td->file_size) == -1) {
+ if (ftruncate(td->fd, td->file_size) == -1) {
td_verror(td, errno);
- temp_stall_ts = 0;
- return 1;
+ goto done;
}
td->io_size = td->file_size;
else if (td->create_fsync)
fsync(td->fd);
- temp_stall_ts = 0;
+ free(b);
+done:
close(td->fd);
td->fd = -1;
- free(b);
+done_noclose:
+ temp_stall_ts = 0;
return 0;
}
{
struct stat st;
- if (fstat(td->fd, &st) == -1) {
- td_verror(td, errno);
- return 1;
- }
+ if (td->overwrite) {
+ if (fstat(td->fd, &st) == -1) {
+ td_verror(td, errno);
+ return 1;
+ }
- td->real_file_size = st.st_size;
+ td->real_file_size = st.st_size;
- if (!td->file_size || td->file_size > td->real_file_size)
- td->file_size = td->real_file_size;
+ if (!td->file_size || td->file_size > td->real_file_size)
+ td->file_size = td->real_file_size;
+ }
td->file_size -= td->file_offset;
return 0;
td_verror(td, ENOENT);
return 1;
}
- if (create_file(td, td->file_size, 0))
+ if (create_file(td, td->file_size))
+ return 1;
+ } else if (td->filetype == FIO_TYPE_FILE &&
+ st.st_size < (off_t) td->file_size) {
+ if (create_file(td, td->file_size))
return 1;
- } else if (td->filetype == FIO_TYPE_FILE) {
- if (st.st_size < (off_t) td->file_size) {
- if (create_file(td, td->file_size - st.st_size, 1))
- return 1;
- }
}
if (td->odirect)
char eta_str[32];
double perc = 0.0;
- if (temp_stall_ts)
+ if (temp_stall_ts || terse_output)
return;
eta_secs = malloc(thread_number * sizeof(int));
mlocked_mem = fio_pin_memory();
- printf("Starting %d thread%s\n", thread_number, thread_number > 1 ? "s" : "");
- fflush(stdout);
+ if (!terse_output) {
+ printf("Starting %d thread%s\n", thread_number, thread_number > 1 ? "s" : "");
+ fflush(stdout);
+ }
signal(SIGINT, sig_handler);
signal(SIGALRM, sig_handler);