Revert "Convert file hash lock to spinlocks"
This reverts commit 0ec7b3c9a0926e6377bd145206bb9f6a70be610d.
diff --git a/filehash.c b/filehash.c
index 97c0b3c..a00ac78 100644
--- a/filehash.c
+++ b/filehash.c
@@ -5,15 +5,13 @@
#include "flist.h"
#include "crc/crc16.h"
-#include "spinlock.h"
-
#define HASH_BUCKETS 512
#define HASH_MASK (HASH_BUCKETS - 1)
unsigned int file_hash_size = HASH_BUCKETS * sizeof(struct flist_head);
static struct flist_head *file_hash;
-static struct fio_spinlock *hash_lock;
+static struct fio_mutex *hash_lock;
static unsigned short hash(const char *name)
{
@@ -22,7 +20,7 @@
void remove_file_hash(struct fio_file *f)
{
- fio_spin_lock(hash_lock);
+ fio_mutex_down(hash_lock);
if (f->flags & FIO_FILE_HASHED) {
assert(!flist_empty(&f->hash_list));
@@ -30,7 +28,7 @@
f->flags &= ~FIO_FILE_HASHED;
}
- fio_spin_unlock(hash_lock);
+ fio_mutex_up(hash_lock);
}
static struct fio_file *__lookup_file_hash(const char *name)
@@ -54,9 +52,9 @@
{
struct fio_file *f;
- fio_spin_lock(hash_lock);
+ fio_mutex_down(hash_lock);
f = __lookup_file_hash(name);
- fio_spin_unlock(hash_lock);
+ fio_mutex_up(hash_lock);
return f;
}
@@ -69,7 +67,7 @@
INIT_FLIST_HEAD(&f->hash_list);
- fio_spin_lock(hash_lock);
+ fio_mutex_down(hash_lock);
alias = __lookup_file_hash(f->file_name);
if (!alias) {
@@ -77,7 +75,7 @@
flist_add_tail(&f->hash_list, &file_hash[hash(f->file_name)]);
}
- fio_spin_unlock(hash_lock);
+ fio_mutex_up(hash_lock);
return alias;
}
@@ -85,17 +83,16 @@
{
unsigned int i, has_entries = 0;
- fio_spin_lock(hash_lock);
+ fio_mutex_down(hash_lock);
for (i = 0; i < HASH_BUCKETS; i++)
has_entries += !flist_empty(&file_hash[i]);
-
- file_hash = NULL;
- fio_spin_unlock(hash_lock);
+ fio_mutex_up(hash_lock);
if (has_entries)
log_err("fio: file hash not empty on exit\n");
- fio_spinlock_remove(hash_lock);
+ file_hash = NULL;
+ fio_mutex_remove(hash_lock);
hash_lock = NULL;
}
@@ -107,5 +104,5 @@
for (i = 0; i < HASH_BUCKETS; i++)
INIT_FLIST_HEAD(&file_hash[i]);
- hash_lock = fio_spinlock_init();
+ hash_lock = fio_mutex_init(1);
}