projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into gfio
[fio.git]
/
filehash.c
diff --git
a/filehash.c
b/filehash.c
index 97c0b3c7633d0e28ab4f44231679301a8d344e6c..392464e2ba61dd2f04caccba893ec5b0c17794cd 100644
(file)
--- a/
filehash.c
+++ b/
filehash.c
@@
-3,9
+3,7
@@
#include "fio.h"
#include "flist.h"
#include "fio.h"
#include "flist.h"
-#include "crc/crc16.h"
-
-#include "spinlock.h"
+#include "hash.h"
#define HASH_BUCKETS 512
#define HASH_MASK (HASH_BUCKETS - 1)
#define HASH_BUCKETS 512
#define HASH_MASK (HASH_BUCKETS - 1)
@@
-13,24
+11,24
@@
unsigned int file_hash_size = HASH_BUCKETS * sizeof(struct flist_head);
static struct flist_head *file_hash;
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)
{
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 remove_file_hash(struct fio_file *f)
{
}
void remove_file_hash(struct fio_file *f)
{
- fio_
spin_lock
(hash_lock);
+ fio_
mutex_down
(hash_lock);
- if (f
->flags & FIO_FILE_HASHED
) {
+ if (f
io_file_hashed(f)
) {
assert(!flist_empty(&f->hash_list));
flist_del_init(&f->hash_list);
assert(!flist_empty(&f->hash_list));
flist_del_init(&f->hash_list);
- f
->flags &= ~FIO_FILE_HASHED
;
+ f
io_file_clear_hashed(f)
;
}
}
- fio_
spin_unlock
(hash_lock);
+ fio_
mutex_up
(hash_lock);
}
static struct fio_file *__lookup_file_hash(const char *name)
}
static struct fio_file *__lookup_file_hash(const char *name)
@@
-41,6
+39,9
@@
static struct fio_file *__lookup_file_hash(const char *name)
flist_for_each(n, bucket) {
struct fio_file *f = flist_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);
return f;
if (!strcmp(f->file_name, name)) {
assert(f->fd != -1);
return f;
@@
-54,9
+55,9
@@
struct fio_file *lookup_file_hash(const char *name)
{
struct fio_file *f;
{
struct fio_file *f;
- fio_
spin_lock
(hash_lock);
+ fio_
mutex_down
(hash_lock);
f = __lookup_file_hash(name);
f = __lookup_file_hash(name);
- fio_
spin_unlock
(hash_lock);
+ fio_
mutex_up
(hash_lock);
return f;
}
return f;
}
@@
-64,20
+65,20
@@
struct fio_file *add_file_hash(struct fio_file *f)
{
struct fio_file *alias;
{
struct fio_file *alias;
- if (f
->flags & FIO_FILE_HASHED
)
+ if (f
io_file_hashed(f)
)
return NULL;
INIT_FLIST_HEAD(&f->hash_list);
return NULL;
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) {
alias = __lookup_file_hash(f->file_name);
if (!alias) {
- f
->flags |= FIO_FILE_HASHED
;
+ f
io_file_set_hashed(f)
;
flist_add_tail(&f->hash_list, &file_hash[hash(f->file_name)]);
}
flist_add_tail(&f->hash_list, &file_hash[hash(f->file_name)]);
}
- fio_
spin_unlock
(hash_lock);
+ fio_
mutex_up
(hash_lock);
return alias;
}
return alias;
}
@@
-85,17
+86,16
@@
void file_hash_exit(void)
{
unsigned int i, has_entries = 0;
{
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]);
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");
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;
}
hash_lock = NULL;
}
@@
-107,5
+107,5
@@
void file_hash_init(void *ptr)
for (i = 0; i < HASH_BUCKETS; i++)
INIT_FLIST_HEAD(&file_hash[i]);
for (i = 0; i < HASH_BUCKETS; i++)
INIT_FLIST_HEAD(&file_hash[i]);
- hash_lock = fio_
spinlock_init(
);
+ hash_lock = fio_
mutex_init(FIO_MUTEX_UNLOCKED
);
}
}