projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
backend: move iolog compression init before CPU affinity settings
[fio.git]
/
filehash.c
diff --git
a/filehash.c
b/filehash.c
index 54cea990f927c158c3987bca29904e9e2bc47b98..0d61f54cca0b2f8c526cd639f9749716069aa8ff 100644
(file)
--- a/
filehash.c
+++ b/
filehash.c
@@
-2,30
+2,43
@@
#include <assert.h>
#include "fio.h"
#include <assert.h>
#include "fio.h"
-#include "list.h"
-#include "crc/crc16.h"
+#include "flist.h"
+#include "hash.h"
+#include "filehash.h"
#define HASH_BUCKETS 512
#define HASH_MASK (HASH_BUCKETS - 1)
#define HASH_BUCKETS 512
#define HASH_MASK (HASH_BUCKETS - 1)
-unsigned int file_hash_size = HASH_BUCKETS * sizeof(struct list_head);
+unsigned int file_hash_size = HASH_BUCKETS * sizeof(struct
f
list_head);
-static struct list_head *file_hash;
+static struct
f
list_head *file_hash;
static struct fio_mutex *hash_lock;
static unsigned short hash(const char *name)
{
static struct fio_mutex *hash_lock;
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);
}
void remove_file_hash(struct fio_file *f)
{
fio_mutex_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 (f
io_file_hashed(f)
) {
+ assert(!
f
list_empty(&f->hash_list));
+
f
list_del_init(&f->hash_list);
+ f
io_file_clear_hashed(f)
;
}
fio_mutex_up(hash_lock);
}
fio_mutex_up(hash_lock);
@@
-33,11
+46,14
@@
void remove_file_hash(struct fio_file *f)
static struct fio_file *__lookup_file_hash(const char *name)
{
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;
+
+ flist_for_each(n, bucket) {
+ struct fio_file *f = flist_entry(n, struct fio_file, hash_list);
- list_for_each(n, bucket) {
-
struct fio_file *f = list_entry(n, struct fio_file, hash_list)
;
+ if (!f->file_name)
+
continue
;
if (!strcmp(f->file_name, name)) {
assert(f->fd != -1);
if (!strcmp(f->file_name, name)) {
assert(f->fd != -1);
@@
-62,17
+78,17
@@
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;
return NULL;
- INIT_LIST_HEAD(&f->hash_list);
+ INIT_
F
LIST_HEAD(&f->hash_list);
fio_mutex_down(hash_lock);
alias = __lookup_file_hash(f->file_name);
if (!alias) {
fio_mutex_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)]);
+ f
io_file_set_hashed(f)
;
+
f
list_add_tail(&f->hash_list, &file_hash[hash(f->file_name)]);
}
fio_mutex_up(hash_lock);
}
fio_mutex_up(hash_lock);
@@
-85,7
+101,7
@@
void file_hash_exit(void)
fio_mutex_down(hash_lock);
for (i = 0; i < HASH_BUCKETS; i++)
fio_mutex_down(hash_lock);
for (i = 0; i < HASH_BUCKETS; i++)
- has_entries += !list_empty(&file_hash[i]);
+ has_entries += !
f
list_empty(&file_hash[i]);
fio_mutex_up(hash_lock);
if (has_entries)
fio_mutex_up(hash_lock);
if (has_entries)
@@
-102,7
+118,7
@@
void file_hash_init(void *ptr)
file_hash = ptr;
for (i = 0; i < HASH_BUCKETS; i++)
file_hash = ptr;
for (i = 0; i < HASH_BUCKETS; i++)
- INIT_LIST_HEAD(&file_hash[i]);
+ INIT_
F
LIST_HEAD(&file_hash[i]);
- hash_lock = fio_mutex_init(
1
);
+ hash_lock = fio_mutex_init(
FIO_MUTEX_UNLOCKED
);
}
}