fio: add serialize_overlap option

[fio.git] / filehash.c

diff --git a/filehash.c b/filehash.c
index dab60fe32e88d0e45e729335c0027c8cdb9e2317..edeeab4863c8ff831391f539e53492f1c78df5c7 100644 (file)
--- a/filehash.c
+++ b/filehash.c
@@ -3,29 +3,47 @@
 
 #include "fio.h"
 #include "flist.h"
-#include "crc/crc16.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 flist_head);
+#define BLOOM_SIZE     16*1024*1024
+
+static unsigned int file_hash_size = HASH_BUCKETS * sizeof(struct flist_head);
 
 static struct flist_head *file_hash;
 static struct fio_mutex *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_mutex_down(hash_lock);
+}
+
+void fio_file_hash_unlock(void)
+{
+       if (hash_lock)
+               fio_mutex_up(hash_lock);
 }
 
 void remove_file_hash(struct fio_file *f)
 {
        fio_mutex_down(hash_lock);
 
-       if (f->flags & FIO_FILE_HASHED) {
+       if (fio_file_hashed(f)) {
                assert(!flist_empty(&f->hash_list));
                flist_del_init(&f->hash_list);
-               f->flags &= ~FIO_FILE_HASHED;
+               fio_file_clear_hashed(f);
        }
 
        fio_mutex_up(hash_lock);
@@ -65,7 +83,7 @@ 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_FLIST_HEAD(&f->hash_list);
@@ -74,7 +92,7 @@ struct fio_file *add_file_hash(struct fio_file *f)
 
        alias = __lookup_file_hash(f->file_name);
        if (!alias) {
-               f->flags |= FIO_FILE_HASHED;
+               fio_file_set_hashed(f);
                flist_add_tail(&f->hash_list, &file_hash[hash(f->file_name)]);
        }
 
@@ -82,6 +100,11 @@ struct fio_file *add_file_hash(struct fio_file *f)
        return alias;
 }
 
+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;
@@ -94,18 +117,23 @@ void file_hash_exit(void)
        if (has_entries)
                log_err("fio: file hash not empty on exit\n");
 
+       sfree(file_hash);
        file_hash = NULL;
        fio_mutex_remove(hash_lock);
        hash_lock = NULL;
+       bloom_free(file_bloom);
+       file_bloom = NULL;
 }
 
-void file_hash_init(void *ptr)
+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_FLIST_HEAD(&file_hash[i]);
 
-       hash_lock = fio_mutex_init(1);
+       hash_lock = fio_mutex_init(FIO_MUTEX_UNLOCKED);
+       file_bloom = bloom_new(BLOOM_SIZE);
 }