X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=filehash.c;h=b55ab7340e68065de4bcb6eb6e8f39111d38886e;hp=b459220b6766317a31e35cba31e546e69768ff6e;hb=04ba61dfa67784d4dfcc22a2b3de7ede28e22e40;hpb=5f1348c709d91ffa54bde1a6a1beb53ecda613b7

diff --git a/filehash.c b/filehash.c
index b459220b..b55ab734 100644
--- a/filehash.c
+++ b/filehash.c
@@ -2,42 +2,63 @@
 #include <assert.h>
 
 #include "fio.h"
-#include "list.h"
-#include "crc/crc16.h"
+#include "flist.h"
+#include "hash.h"
+#include "filehash.h"
+#include "smalloc.h"
+#include "lib/bloom.h"
 
 #define HASH_BUCKETS	512
 #define HASH_MASK	(HASH_BUCKETS - 1)
 
-unsigned int file_hash_size = HASH_BUCKETS * sizeof(struct list_head);
+#define BLOOM_SIZE	16*1024*1024
 
-static struct list_head *file_hash;
-static struct fio_mutex *hash_lock;
+static unsigned int file_hash_size = HASH_BUCKETS * sizeof(struct flist_head);
+
+static struct flist_head *file_hash;
+static struct fio_sem *hash_lock;
+static struct bloom *file_bloom;
 
 static unsigned short hash(const char *name)
 {
-	return crc16((const unsigned char *) name, strlen(name)) & HASH_MASK;
+	return jhash(name, strlen(name), 0) & HASH_MASK;
+}
+
+void fio_file_hash_lock(void)
+{
+	if (hash_lock)
+		fio_sem_down(hash_lock);
+}
+
+void fio_file_hash_unlock(void)
+{
+	if (hash_lock)
+		fio_sem_up(hash_lock);
 }
 
 void remove_file_hash(struct fio_file *f)
 {
-	fio_mutex_down(hash_lock);
+	fio_sem_down(hash_lock);
 
-	if (f->flags & FIO_FILE_HASHED) {
-		assert(!list_empty(&f->hash_list));
-		list_del_init(&f->hash_list);
-		f->flags &= ~FIO_FILE_HASHED;
+	if (fio_file_hashed(f)) {
+		assert(!flist_empty(&f->hash_list));
+		flist_del_init(&f->hash_list);
+		fio_file_clear_hashed(f);
 	}
 
-	fio_mutex_up(hash_lock);
+	fio_sem_up(hash_lock);
 }
 
 static struct fio_file *__lookup_file_hash(const char *name)
 {
-	struct list_head *bucket = &file_hash[hash(name)];
-	struct list_head *n;
+	struct flist_head *bucket = &file_hash[hash(name)];
+	struct flist_head *n;
 
-	list_for_each(n, bucket) {
-		struct fio_file *f = list_entry(n, struct fio_file, hash_list);
+	flist_for_each(n, bucket) {
+		struct fio_file *f = flist_entry(n, struct fio_file, hash_list);
+
+		if (!f->file_name)
+			continue;
 
 		if (!strcmp(f->file_name, name)) {
 			assert(f->fd != -1);
@@ -52,9 +73,9 @@ struct fio_file *lookup_file_hash(const char *name)
 {
 	struct fio_file *f;
 
-	fio_mutex_down(hash_lock);
+	fio_sem_down(hash_lock);
 	f = __lookup_file_hash(name);
-	fio_mutex_up(hash_lock);
+	fio_sem_up(hash_lock);
 	return f;
 }
 
@@ -62,30 +83,57 @@ struct fio_file *add_file_hash(struct fio_file *f)
 {
 	struct fio_file *alias;
 
-	if (f->flags & FIO_FILE_HASHED)
+	if (fio_file_hashed(f))
 		return NULL;
 
-	INIT_LIST_HEAD(&f->hash_list);
+	INIT_FLIST_HEAD(&f->hash_list);
 
-	fio_mutex_down(hash_lock);
+	fio_sem_down(hash_lock);
 
 	alias = __lookup_file_hash(f->file_name);
 	if (!alias) {
-		f->flags |= FIO_FILE_HASHED;
-		list_add_tail(&f->hash_list, &file_hash[hash(f->file_name)]);
+		fio_file_set_hashed(f);
+		flist_add_tail(&f->hash_list, &file_hash[hash(f->file_name)]);
 	}
 
-	fio_mutex_up(hash_lock);
+	fio_sem_up(hash_lock);
 	return alias;
 }
 
-void file_hash_init(void *ptr)
+bool file_bloom_exists(const char *fname, bool set)
+{
+	return bloom_string(file_bloom, fname, strlen(fname), set);
+}
+
+void file_hash_exit(void)
+{
+	unsigned int i, has_entries = 0;
+
+	fio_sem_down(hash_lock);
+	for (i = 0; i < HASH_BUCKETS; i++)
+		has_entries += !flist_empty(&file_hash[i]);
+	fio_sem_up(hash_lock);
+
+	if (has_entries)
+		log_err("fio: file hash not empty on exit\n");
+
+	sfree(file_hash);
+	file_hash = NULL;
+	fio_sem_remove(hash_lock);
+	hash_lock = NULL;
+	bloom_free(file_bloom);
+	file_bloom = NULL;
+}
+
+void file_hash_init(void)
 {
 	unsigned int i;
 
-	file_hash = ptr;
+	file_hash = smalloc(file_hash_size);
+
 	for (i = 0; i < HASH_BUCKETS; i++)
-		INIT_LIST_HEAD(&file_hash[i]);
+		INIT_FLIST_HEAD(&file_hash[i]);
 
-	hash_lock = fio_mutex_init(1);
+	hash_lock = fio_sem_init(FIO_SEM_UNLOCKED);
+	file_bloom = bloom_new(BLOOM_SIZE);
 }