hashmap: introduce hash_ops to make struct Hashmap smaller

It is redundant to store 'hash' and 'compare' function pointers in
struct Hashmap separately. The functions always comprise a pair.
Store a single pointer to struct hash_ops instead.

systemd keeps hundreds of hashmaps, so this saves a little bit of
memory.
This commit is contained in:
Michal Schmidt
2014-09-15 16:08:50 +02:00
parent f44541bc93
commit d5099efc47
82 changed files with 278 additions and 226 deletions
+11 -11
View File
@@ -107,11 +107,11 @@ static int load_user_database(void) {
if (!f)
return errno == ENOENT ? 0 : -errno;
r = hashmap_ensure_allocated(&database_user, string_hash_func, string_compare_func);
r = hashmap_ensure_allocated(&database_user, &string_hash_ops);
if (r < 0)
return r;
r = hashmap_ensure_allocated(&database_uid, trivial_hash_func, trivial_compare_func);
r = hashmap_ensure_allocated(&database_uid, NULL);
if (r < 0)
return r;
@@ -159,11 +159,11 @@ static int load_group_database(void) {
if (!f)
return errno == ENOENT ? 0 : -errno;
r = hashmap_ensure_allocated(&database_group, string_hash_func, string_compare_func);
r = hashmap_ensure_allocated(&database_group, &string_hash_ops);
if (r < 0)
return r;
r = hashmap_ensure_allocated(&database_gid, trivial_hash_func, trivial_compare_func);
r = hashmap_ensure_allocated(&database_gid, NULL);
if (r < 0)
return r;
@@ -969,7 +969,7 @@ static int add_user(Item *i) {
i->uid = search_uid;
}
r = hashmap_ensure_allocated(&todo_uids, trivial_hash_func, trivial_compare_func);
r = hashmap_ensure_allocated(&todo_uids, NULL);
if (r < 0)
return log_oom();
@@ -1122,7 +1122,7 @@ static int add_group(Item *i) {
i->gid = search_uid;
}
r = hashmap_ensure_allocated(&todo_gids, trivial_hash_func, trivial_compare_func);
r = hashmap_ensure_allocated(&todo_gids, NULL);
if (r < 0)
return log_oom();
@@ -1210,7 +1210,7 @@ static int add_implicit(void) {
if (!i) {
_cleanup_(item_freep) Item *j = NULL;
r = hashmap_ensure_allocated(&groups, string_hash_func, string_compare_func);
r = hashmap_ensure_allocated(&groups, &string_hash_ops);
if (r < 0)
return log_oom();
@@ -1237,7 +1237,7 @@ static int add_implicit(void) {
if (!i) {
_cleanup_(item_freep) Item *j = NULL;
r = hashmap_ensure_allocated(&users, string_hash_func, string_compare_func);
r = hashmap_ensure_allocated(&users, &string_hash_ops);
if (r < 0)
return log_oom();
@@ -1542,7 +1542,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
return -EINVAL;
}
r = hashmap_ensure_allocated(&members, string_hash_func, string_compare_func);
r = hashmap_ensure_allocated(&members, &string_hash_ops);
if (r < 0)
return log_oom();
@@ -1584,7 +1584,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
return -EINVAL;
}
r = hashmap_ensure_allocated(&users, string_hash_func, string_compare_func);
r = hashmap_ensure_allocated(&users, &string_hash_ops);
if (r < 0)
return log_oom();
@@ -1634,7 +1634,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
return -EINVAL;
}
r = hashmap_ensure_allocated(&groups, string_hash_func, string_compare_func);
r = hashmap_ensure_allocated(&groups, &string_hash_ops);
if (r < 0)
return log_oom();