X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=filesetup.c;h=4e2a36cd9debb6968302cd54bd117b967a6b78da;hp=20ef3f8ffc97ce238e39ba4f2ef21e46a188bf7a;hb=29c1349f1840c3f60434c9da602074bc8fde4afe;hpb=ee56ad500f6692381e131cc37299d23fa910a24a

diff --git a/filesetup.c b/filesetup.c
index 20ef3f8f..4e2a36cd 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -8,6 +8,8 @@
 #include <sys/types.h>
 
 #include "fio.h"
+#include "smalloc.h"
+#include "filehash.h"
 
 static int root_warn;
 
@@ -33,8 +35,8 @@ static int extend_file(struct thread_data *td, struct fio_file *f)
 	if (td_write(td) && !td->o.overwrite)
 		unlink_file = 1;
 
-	if ((unlink_file || new_layout) && (f->flags & FIO_FILE_EXISTS)) {
-		if (unlink(f->file_name) < 0) {
+	if (unlink_file || new_layout) {
+		if ((unlink(f->file_name) < 0) && (errno != ENOENT)) {
 			td_verror(td, errno, "unlink");
 			return 1;
 		}
@@ -209,17 +211,27 @@ int file_invalidate_cache(struct thread_data *td, struct fio_file *f)
 	return ret;
 }
 
-void generic_close_file(struct thread_data fio_unused *td, struct fio_file *f)
+int generic_close_file(struct thread_data fio_unused *td, struct fio_file *f)
 {
+	int ret = 0;
+
 	dprint(FD_FILE, "fd close %s\n", f->file_name);
-	close(f->fd);
+
+	remove_file_hash(f);
+
+	if (close(f->fd) < 0)
+		ret = errno;
+
 	f->fd = -1;
+	return ret;
 }
 
 int generic_open_file(struct thread_data *td, struct fio_file *f)
 {
+	struct fio_file *__f;
 	int is_std = 0;
 	int flags = 0;
+	int from_hash = 0;
 
 	dprint(FD_FILE, "fd open %s\n", f->file_name);
 
@@ -255,8 +267,16 @@ open_again:
 
 		if (is_std)
 			f->fd = dup(STDOUT_FILENO);
-		else
-			f->fd = open(f->file_name, flags, 0600);
+		else {
+			__f = lookup_file_hash(f->file_name);
+			if (__f) {
+				f->sem = __f->sem;
+				f->fd = dup(__f->fd);
+				f->references++;
+				from_hash = 1;
+			} else
+				f->fd = open(f->file_name, flags, 0600);
+		}
 	} else {
 		if (f->filetype == FIO_TYPE_CHAR && !read_only)
 			flags |= O_RDWR;
@@ -265,8 +285,16 @@ open_again:
 
 		if (is_std)
 			f->fd = dup(STDIN_FILENO);
-		else
-			f->fd = open(f->file_name, flags);
+		else {
+			__f = lookup_file_hash(f->file_name);
+			if (__f) {
+				f->sem = __f->sem;
+				f->fd = dup(__f->fd);
+				f->references++;
+				from_hash = 1;
+			} else
+				f->fd = open(f->file_name, flags);
+		}
 	}
 
 	if (f->fd == -1) {
@@ -286,6 +314,18 @@ open_again:
 	if (get_file_size(td, f))
 		goto err;
 
+	if (!from_hash && f->fd != -1) {
+		if (add_file_hash(f)) {
+			int ret;
+
+			/*
+			 * OK to ignore, we haven't done anything with it
+			 */
+			ret = generic_close_file(td, f);
+			goto open_again;
+		}
+	}
+
 	return 0;
 err:
 	close(f->fd);
@@ -497,19 +537,18 @@ int init_random_map(struct thread_data *td)
 	struct fio_file *f;
 	unsigned int i;
 
-	if (td->o.norandommap)
+	if (td->o.norandommap || !td_random(td))
 		return 0;
 
 	for_each_file(td, f, i) {
 		blocks = (f->real_file_size + td->o.rw_min_bs - 1) / (unsigned long long) td->o.rw_min_bs;
 		num_maps = (blocks + BLOCKS_PER_MAP-1)/ (unsigned long long) BLOCKS_PER_MAP;
-		f->file_map = malloc(num_maps * sizeof(long));
+		f->file_map = smalloc(num_maps * sizeof(long));
 		if (!f->file_map) {
 			log_err("fio: failed allocating random map. If running a large number of jobs, try the 'norandommap' option\n");
 			return 1;
 		}
 		f->num_maps = num_maps;
-		memset(f->file_map, 0, num_maps * sizeof(long));
 	}
 
 	return 0;
@@ -520,6 +559,15 @@ void close_files(struct thread_data *td)
 	struct fio_file *f;
 	unsigned int i;
 
+	for_each_file(td, f, i)
+		td_io_close_file(td, f);
+}
+
+void close_and_free_files(struct thread_data *td)
+{
+	struct fio_file *f;
+	unsigned int i;
+
 	dprint(FD_FILE, "close files\n");
 
 	for_each_file(td, f, i) {
@@ -528,13 +576,14 @@ void close_files(struct thread_data *td)
 
 		td_io_close_file(td, f);
 
-		free(f->file_name);
+		sfree(f->file_name);
 		f->file_name = NULL;
 
 		if (f->file_map) {
-			free(f->file_map);
+			sfree(f->file_map);
 			f->file_map = NULL;
 		}
+		sfree(f);
 	}
 
 	td->o.filename = NULL;
@@ -571,12 +620,13 @@ int add_file(struct thread_data *td, const char *fname)
 
 	dprint(FD_FILE, "add file %s\n", fname);
 
-	td->files = realloc(td->files, (cur_files + 1) * sizeof(*f));
-
-	f = &td->files[cur_files];
-	memset(f, 0, sizeof(*f));
+	f = smalloc(sizeof(*f));
 	f->fd = -1;
 
+	td->files = realloc(td->files, (cur_files + 1) * sizeof(f));
+
+	td->files[cur_files] = f;
+
 	/*
 	 * init function, io engine may not be loaded yet
 	 */
@@ -587,10 +637,13 @@ int add_file(struct thread_data *td, const char *fname)
 		len = sprintf(file_name, "%s/", td->o.directory);
 
 	sprintf(file_name + len, "%s", fname);
-	f->file_name = strdup(file_name);
+	f->file_name = smalloc_strdup(file_name);
 
 	get_file_type(f);
 
+	if (td->o.lockfile)
+		f->sem = fio_sem_init(1);
+
 	td->files_index++;
 	if (f->filetype == FIO_TYPE_FILE)
 		td->nr_normal_files++;
@@ -600,30 +653,60 @@ int add_file(struct thread_data *td, const char *fname)
 
 void get_file(struct fio_file *f)
 {
-	dprint(FD_FILE, "get file %s/%d\n", f->file_name, f->references);
+	dprint(FD_FILE, "get file %s, ref=%d\n", f->file_name, f->references);
 	assert(f->flags & FIO_FILE_OPEN);
 	f->references++;
 }
 
-void put_file(struct thread_data *td, struct fio_file *f)
+int put_file(struct thread_data *td, struct fio_file *f)
 {
-	dprint(FD_FILE, "get put %s/%d\n", f->file_name, f->references);
+	int ret = 0;
+
+	dprint(FD_FILE, "put file %s, ref=%d\n", f->file_name, f->references);
 
 	if (!(f->flags & FIO_FILE_OPEN))
-		return;
+		return 0;
 
 	assert(f->references);
 	if (--f->references)
-		return;
+		return 0;
 
 	if (should_fsync(td) && td->o.fsync_on_close)
 		fsync(f->fd);
 
 	if (td->io_ops->close_file)
-		td->io_ops->close_file(td, f);
+		ret = td->io_ops->close_file(td, f);
 
 	td->nr_open_files--;
 	f->flags &= ~FIO_FILE_OPEN;
+	return ret;
+}
+
+void lock_file(struct thread_data *td, struct fio_file *f)
+{
+	if (f && f->sem) {
+		if (f->sem_owner == td && f->sem_batch--)
+			return;
+
+		fio_sem_down(f->sem);
+		f->sem_owner = td;
+		f->sem_batch = td->o.lockfile_batch;
+	}
+}
+
+void unlock_file(struct fio_file *f)
+{
+	if (f && f->sem) {
+		int sem_val;
+
+		if (f->sem_batch)
+			return;
+
+		sem_getvalue(&f->sem->sem, &sem_val);
+		if (!sem_val)
+			f->sem_owner = NULL;
+		fio_sem_up(f->sem);
+	}
 }
 
 static int recurse_dir(struct thread_data *td, const char *dirname)
@@ -692,13 +775,19 @@ void dup_files(struct thread_data *td, struct thread_data *org)
 	if (!org->files)
 		return;
 
-	bytes = org->files_index * sizeof(*f);
+	bytes = org->files_index * sizeof(f);
 	td->files = malloc(bytes);
 	memcpy(td->files, org->files, bytes);
 
 	for_each_file(td, f, i) {
+		struct fio_file *__f;
+
+		__f = smalloc(sizeof(*__f));
+
 		if (f->file_name)
-			f->file_name = strdup(f->file_name);
+			__f->file_name = smalloc_strdup(f->file_name);
+
+		td->files[i] = __f;
 	}
 }