mirror of
https://github.com/systemd/systemd
synced 2024-09-06 16:56:43 +00:00
hashmap: try to use the existing 64bit hash functions for dev_t if it is 64bit
This commit is contained in:
parent
1ac36c67dd
commit
de99c9dcba
|
@ -225,6 +225,7 @@ AC_CHECK_SIZEOF(pid_t)
|
|||
AC_CHECK_SIZEOF(uid_t)
|
||||
AC_CHECK_SIZEOF(gid_t)
|
||||
AC_CHECK_SIZEOF(time_t)
|
||||
AC_CHECK_SIZEOF(dev_t)
|
||||
AC_CHECK_SIZEOF(rlim_t,,[
|
||||
#include <sys/time.h>
|
||||
#include <sys/resource.h>
|
||||
|
|
|
@ -44,21 +44,6 @@
|
|||
|
||||
static void session_remove_fifo(Session *s);
|
||||
|
||||
static unsigned long devt_hash_func(const void *p, const uint8_t hash_key[HASH_KEY_SIZE]) {
|
||||
uint64_t u = *(const dev_t*)p;
|
||||
|
||||
return uint64_hash_func(&u, hash_key);
|
||||
}
|
||||
|
||||
static int devt_compare_func(const void *_a, const void *_b) {
|
||||
dev_t a, b;
|
||||
|
||||
a = *(const dev_t*) _a;
|
||||
b = *(const dev_t*) _b;
|
||||
|
||||
return a < b ? -1 : (a > b ? 1 : 0);
|
||||
}
|
||||
|
||||
Session* session_new(Manager *m, const char *id) {
|
||||
Session *s;
|
||||
|
||||
|
|
|
@ -164,6 +164,21 @@ int uint64_compare_func(const void *_a, const void *_b) {
|
|||
return a < b ? -1 : (a > b ? 1 : 0);
|
||||
}
|
||||
|
||||
#if SIZEOF_DEV_T != 8
|
||||
unsigned long devt_hash_func(const void *p, const uint8_t hash_key[HASH_KEY_SIZE]) {
|
||||
uint64_t u;
|
||||
siphash24((uint8_t*) &u, p, sizeof(dev_t), hash_key);
|
||||
return (unsigned long) u;
|
||||
}
|
||||
|
||||
int devt_compare_func(const void *_a, const void *_b) {
|
||||
dev_t a, b;
|
||||
a = *(const dev_t*) _a;
|
||||
b = *(const dev_t*) _b;
|
||||
return a < b ? -1 : (a > b ? 1 : 0);
|
||||
}
|
||||
#endif
|
||||
|
||||
static unsigned bucket_hash(Hashmap *h, const void *p) {
|
||||
return (unsigned) (h->hash_func(p, h->hash_key) % h->n_buckets);
|
||||
}
|
||||
|
|
|
@ -52,9 +52,23 @@ int string_compare_func(const void *a, const void *b) _pure_;
|
|||
unsigned long trivial_hash_func(const void *p, const uint8_t hash_key[HASH_KEY_SIZE]) _pure_;
|
||||
int trivial_compare_func(const void *a, const void *b) _const_;
|
||||
|
||||
/* 32bit values we can always just embedd in the pointer itself, but
|
||||
* in order to support 32bit archs we need store 64bit values
|
||||
* indirectly, since they don't fit in a pointer. */
|
||||
unsigned long uint64_hash_func(const void *p, const uint8_t hash_key[HASH_KEY_SIZE]) _pure_;
|
||||
int uint64_compare_func(const void *a, const void *b) _pure_;
|
||||
|
||||
/* On some archs dev_t is 32bit, and on others 64bit. And sometimes
|
||||
* it's 64bit on 32bit archs, and sometimes 32bit on 64bit archs. Yuck! */
|
||||
#if SIZEOF_DEV_T != 8
|
||||
unsigned long devt_hash_func(const void *p, const uint8_t hash_key[HASH_KEY_SIZE]) _pure_;
|
||||
int devt_compare_func(const void *a, const void *b) _pure_;
|
||||
#else
|
||||
/* No need to define a second version of this... */
|
||||
#define devt_hash_func uint64_hash_func
|
||||
#define devt_compare_func uint64_compare_func
|
||||
#endif
|
||||
|
||||
Hashmap *hashmap_new(hash_func_t hash_func, compare_func_t compare_func);
|
||||
void hashmap_free(Hashmap *h);
|
||||
void hashmap_free_free(Hashmap *h);
|
||||
|
|
Loading…
Reference in a new issue