X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=filesetup.c;h=4e2a36cd9debb6968302cd54bd117b967a6b78da;hb=0b2d6a7a2bf9f49502b9c1161f376fff53727089;hp=188b0ce88c476633b0a42931ef901dc9000b171c;hpb=b2bd2bd96a09540b3add0ec74db2cdb1c145ca33;p=fio.git

diff --git a/filesetup.c b/filesetup.c
index 188b0ce8..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;
 
@@ -214,6 +216,9 @@ 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);
+
+	remove_file_hash(f);
+
 	if (close(f->fd) < 0)
 		ret = errno;
 
@@ -223,8 +228,10 @@ int generic_close_file(struct thread_data fio_unused *td, struct fio_file *f)
 
 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);
 
@@ -260,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;
@@ -270,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) {
@@ -291,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);
@@ -508,13 +543,12 @@ int init_random_map(struct thread_data *td)
 	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;
@@ -542,13 +576,14 @@ void close_and_free_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;
@@ -585,8 +620,7 @@ int add_file(struct thread_data *td, const char *fname)
 
 	dprint(FD_FILE, "add file %s\n", fname);
 
-	f = malloc(sizeof(*f));
-	memset(f, 0, sizeof(*f));
+	f = smalloc(sizeof(*f));
 	f->fd = -1;
 
 	td->files = realloc(td->files, (cur_files + 1) * sizeof(f));
@@ -603,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++;
@@ -647,10 +684,29 @@ int put_file(struct thread_data *td, struct fio_file *f)
 
 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)
@@ -719,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;
 	}
 }