From d5099efc47d4e6ac60816b5381a5f607ab03f06e Mon Sep 17 00:00:00 2001

From: Michal Schmidt <mschmidt@redhat.com>

Date: Wed, 13 Aug 2014 01:00:18 +0200

Subject: [PATCH] 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.

---

 src/analyze/analyze.c                   |  2 +-

 src/bus-proxyd/bus-policy.c             |  4 +--

 src/cgtop/cgtop.c                       |  4 +--

 src/core/automount.c                    |  4 +--

 src/core/bus-endpoint.c                 |  2 +-

 src/core/dbus-manager.c                 |  2 +-

 src/core/dbus.c                         |  2 +-

 src/core/device.c                       |  4 +--

 src/core/killall.c                      |  2 +-

 src/core/load-fragment.c                | 10 +++----

 src/core/manager.c                      | 14 ++++-----

 src/core/mount-setup.c                  |  2 +-

 src/core/swap.c                         |  4 +--

 src/core/transaction.c                  |  2 +-

 src/core/unit.c                         | 22 +++++++--------

 src/delta/delta.c                       |  8 +++---

 src/journal-remote/journal-remote.c     | 18 ++++--------

 src/journal/catalog.c                   | 11 ++++++--

 src/journal/catalog.h                   |  3 +-

 src/journal/coredump-vacuum.c           |  2 +-

 src/journal/coredumpctl.c               |  2 +-

 src/journal/journal-file.c              |  2 +-

 src/journal/journalctl.c                |  2 +-

 src/journal/journald-server.c           |  2 +-

 src/journal/mmap-cache.c                |  4 +--

 src/journal/sd-journal.c                |  8 +++---

 src/journal/test-catalog.c              |  2 +-

 src/libsystemd-network/sd-dhcp-server.c |  8 ++++--

 src/libsystemd/sd-bus/bus-match.c       |  4 +--

 src/libsystemd/sd-bus/bus-objects.c     | 13 ++++++---

 src/libsystemd/sd-bus/bus-track.c       |  2 +-

 src/libsystemd/sd-bus/bus-util.c        |  2 +-

 src/libsystemd/sd-bus/busctl.c          |  2 +-

 src/libsystemd/sd-bus/sd-bus.c          |  2 +-

 src/libsystemd/sd-event/sd-event.c      |  4 +--

 src/libsystemd/sd-rtnl/sd-rtnl.c        |  2 +-

 src/locale/localectl.c                  |  2 +-

 src/login/logind-acl.c                  |  2 +-

 src/login/logind-session.c              |  2 +-

 src/login/logind.c                      | 18 ++++++------

 src/machine/machined.c                  |  6 ++--

 src/network/networkd-link.c             |  2 +-

 src/network/networkd-manager.c          |  8 +++---

 src/network/networkd-network.c          |  6 ++--

 src/network/networkd-wait-online-link.c |  5 ++--

 src/readahead/readahead-collect.c       |  2 +-

 src/remount-fs/remount-fs.c             |  2 +-

 src/resolve/resolved-dns-cache.c        |  2 +-

 src/resolve/resolved-dns-domain.c       |  5 ++++

 src/resolve/resolved-dns-domain.h       |  1 +

 src/resolve/resolved-dns-packet.c       |  4 +--

 src/resolve/resolved-dns-query.c        |  4 +--

 src/resolve/resolved-dns-rr.c           |  9 ++++--

 src/resolve/resolved-dns-rr.h           |  4 +--

 src/resolve/resolved-dns-scope.c        |  2 +-

 src/resolve/resolved-dns-server.c       |  9 ++++--

 src/resolve/resolved-dns-server.h       |  3 +-

 src/resolve/resolved-dns-transaction.c  |  2 +-

 src/resolve/resolved-dns-zone.c         |  6 ++--

 src/resolve/resolved-link.c             |  2 +-

 src/resolve/resolved-manager.c          |  4 +--

 src/shared/cgroup-util.c                |  6 ++--

 src/shared/conf-files.c                 |  2 +-

 src/shared/fdset.c                      |  2 +-

 src/shared/hashmap.c                    | 42 +++++++++++++++++++--------

 src/shared/hashmap.h                    | 18 ++++++++++--

 src/shared/install.c                    |  8 +++---

 src/shared/locale-util.c                |  2 +-

 src/shared/logs-show.c                  |  2 +-

 src/shared/set.c                        |  8 +++---

 src/shared/set.h                        |  4 +--

 src/shared/util.c                       |  6 ++--

 src/socket-proxy/socket-proxyd.c        |  4 +--

 src/sysctl/sysctl.c                     |  2 +-

 src/systemctl/systemctl.c               |  6 ++--

 src/sysusers/sysusers.c                 | 22 +++++++--------

 src/sysv-generator/sysv-generator.c     |  8 ++----

 src/test/test-hashmap.c                 | 50 ++++++++++++++++-----------------

 src/test/test-install.c                 |  2 +-

 src/test/test-prioq.c                   |  7 ++++-

 src/test/test-unit-file.c               |  2 +-

 src/tmpfiles/tmpfiles.c                 |  6 ++--

 82 files changed, 278 insertions(+), 226 deletions(-)

diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c

index 82f5cf3c57..5e55988063 100644

--- a/src/analyze/analyze.c

+++ b/src/analyze/analyze.c

@@ -907,7 +907,7 @@ static int analyze_critical_chain(sd_bus *bus, char *names[]) {

         if (n <= 0)

                 return n;

-        h = hashmap_new(string_hash_func, string_compare_func);

+        h = hashmap_new(&string_hash_ops);

         if (!h)

                 return -ENOMEM;

diff --git a/src/bus-proxyd/bus-policy.c b/src/bus-proxyd/bus-policy.c

index 06c16a7eb6..d2eace9405 100644

--- a/src/bus-proxyd/bus-policy.c

+++ b/src/bus-proxyd/bus-policy.c

@@ -338,7 +338,7 @@ static int file_load(Policy *p, const char *path) {

                                         assert_cc(sizeof(uid_t) == sizeof(uint32_t));

-                                        r = hashmap_ensure_allocated(&p->user_items, trivial_hash_func, trivial_compare_func);

+                                        r = hashmap_ensure_allocated(&p->user_items, NULL);

                                         if (r < 0)

                                                 return log_oom();

@@ -369,7 +369,7 @@ static int file_load(Policy *p, const char *path) {

                                         assert_cc(sizeof(gid_t) == sizeof(uint32_t));

-                                        r = hashmap_ensure_allocated(&p->group_items, trivial_hash_func, trivial_compare_func);

+                                        r = hashmap_ensure_allocated(&p->group_items, NULL);

                                         if (r < 0)

                                                 return log_oom();

diff --git a/src/cgtop/cgtop.c b/src/cgtop/cgtop.c

index 509fe4cdc8..ab8c4cfda1 100644

--- a/src/cgtop/cgtop.c

+++ b/src/cgtop/cgtop.c

@@ -695,8 +695,8 @@ int main(int argc, char *argv[]) {

         if (r <= 0)

                 goto finish;

-        a = hashmap_new(string_hash_func, string_compare_func);

-        b = hashmap_new(string_hash_func, string_compare_func);

+        a = hashmap_new(&string_hash_ops);

+        b = hashmap_new(&string_hash_ops);

         if (!a || !b) {

                 r = log_oom();

                 goto finish;

diff --git a/src/core/automount.c b/src/core/automount.c

index 73a8ce17e4..f72aca2957 100644

--- a/src/core/automount.c

+++ b/src/core/automount.c

@@ -685,7 +685,7 @@ static int automount_deserialize_item(Unit *u, const char *key, const char *valu

                         log_debug_unit(u->id, "Failed to parse token value %s", value);

                 else {

                         if (!a->tokens)

-                                if (!(a->tokens = set_new(trivial_hash_func, trivial_compare_func)))

+                                if (!(a->tokens = set_new(NULL)))

                                         return -ENOMEM;

                         r = set_put(a->tokens, UINT_TO_PTR(token));

@@ -762,7 +762,7 @@ static int automount_dispatch_io(sd_event_source *s, int fd, uint32_t events, vo

                 } else

                         log_debug_unit(UNIT(a)->id, "Got direct mount request on %s", a->where);

-                r = set_ensure_allocated(&a->tokens, trivial_hash_func, trivial_compare_func);

+                r = set_ensure_allocated(&a->tokens, NULL);

                 if (r < 0) {

                         log_error_unit(UNIT(a)->id, "Failed to allocate token set.");

                         goto fail;

diff --git a/src/core/bus-endpoint.c b/src/core/bus-endpoint.c

index 8d11974db4..1e8f07eb54 100644

--- a/src/core/bus-endpoint.c

+++ b/src/core/bus-endpoint.c

@@ -55,7 +55,7 @@ int bus_endpoint_add_policy(BusEndpoint *ep, const char *name, BusPolicyAccess a

                         return 0;

                 }

         } else {

-                ep->policy_hash = hashmap_new(string_hash_func, string_compare_func);

+                ep->policy_hash = hashmap_new(&string_hash_ops);

                 if (!ep->policy_hash)

                         return -ENOMEM;

         }

diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c

index 2fe9d193f6..533ce439a7 100644

--- a/src/core/dbus-manager.c

+++ b/src/core/dbus-manager.c

@@ -1399,7 +1399,7 @@ static int method_list_unit_files(sd_bus *bus, sd_bus_message *message, void *us

         if (r < 0)

                 return r;

-        h = hashmap_new(string_hash_func, string_compare_func);

+        h = hashmap_new(&string_hash_ops);

         if (!h)

                 return -ENOMEM;

diff --git a/src/core/dbus.c b/src/core/dbus.c

index e7eee3c6d1..09b4a4ac6f 100644

--- a/src/core/dbus.c

+++ b/src/core/dbus.c

@@ -659,7 +659,7 @@ static int bus_on_connection(sd_event_source *s, int fd, uint32_t revents, void

                 return 0;

         }

-        r = set_ensure_allocated(&m->private_buses, trivial_hash_func, trivial_compare_func);

+        r = set_ensure_allocated(&m->private_buses, NULL);

         if (r < 0) {

                 log_oom();

                 return 0;

diff --git a/src/core/device.c b/src/core/device.c

index 0f28a16874..11c4261081 100644

--- a/src/core/device.c

+++ b/src/core/device.c

@@ -304,7 +304,7 @@ static int device_update_unit(Manager *m, struct udev_device *dev, const char *p

                         goto fail;

                 }

-                r = hashmap_ensure_allocated(&m->devices_by_sysfs, string_hash_func, string_compare_func);

+                r = hashmap_ensure_allocated(&m->devices_by_sysfs, &string_hash_ops);

                 if (r < 0)

                         goto fail;

@@ -517,7 +517,7 @@ static int device_following_set(Unit *u, Set **_set) {

                 return 0;

         }

-        set = set_new(NULL, NULL);

+        set = set_new(NULL);

         if (!set)

                 return -ENOMEM;

diff --git a/src/core/killall.c b/src/core/killall.c

index 291e1f90ee..a6ff50a5a4 100644

--- a/src/core/killall.c

+++ b/src/core/killall.c

@@ -205,7 +205,7 @@ void broadcast_signal(int sig, bool wait_for_exit, bool send_sighup) {

         _cleanup_set_free_ Set *pids = NULL;

         if (wait_for_exit)

-                pids = set_new(trivial_hash_func, trivial_compare_func);

+                pids = set_new(NULL);

         assert_se(sigemptyset(&mask) == 0);

         assert_se(sigaddset(&mask, SIGCHLD) == 0);

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c

index 7cf19b93cc..0620882b4e 100644

--- a/src/core/load-fragment.c

+++ b/src/core/load-fragment.c

@@ -2276,7 +2276,7 @@ int config_parse_syscall_filter(

         }

         if (!c->syscall_filter) {

-                c->syscall_filter = set_new(trivial_hash_func, trivial_compare_func);

+                c->syscall_filter = set_new(NULL);

                 if (!c->syscall_filter)

                         return log_oom();

@@ -2368,7 +2368,7 @@ int config_parse_syscall_archs(

                 return 0;

         }

-        r = set_ensure_allocated(archs, trivial_hash_func, trivial_compare_func);

+        r = set_ensure_allocated(archs, NULL);

         if (r < 0)

                 return log_oom();

@@ -2474,7 +2474,7 @@ int config_parse_address_families(

         }

         if (!c->address_families) {

-                c->address_families = set_new(trivial_hash_func, trivial_compare_func);

+                c->address_families = set_new(NULL);

                 if (!c->address_families)

                         return log_oom();

@@ -3092,7 +3092,7 @@ int config_parse_set_status(

                         }

                 }

-                r = set_ensure_allocated(&status_set->status, NULL, NULL);

+                r = set_ensure_allocated(&status_set->status, NULL);

                 if (r < 0)

                         return log_oom();

@@ -3423,7 +3423,7 @@ static int load_from_path(Unit *u, const char *path) {

         assert(u);

         assert(path);

-        symlink_names = set_new(string_hash_func, string_compare_func);

+        symlink_names = set_new(&string_hash_ops);

         if (!symlink_names)

                 return -ENOMEM;

diff --git a/src/core/manager.c b/src/core/manager.c

index 095111e8c6..0770727cde 100644

--- a/src/core/manager.c

+++ b/src/core/manager.c

@@ -449,27 +449,27 @@ int manager_new(SystemdRunningAs running_as, bool test_run, Manager **_m) {

         if (r < 0)

                 goto fail;

-        r = hashmap_ensure_allocated(&m->units, string_hash_func, string_compare_func);

+        r = hashmap_ensure_allocated(&m->units, &string_hash_ops);

         if (r < 0)

                 goto fail;

-        r = hashmap_ensure_allocated(&m->jobs, trivial_hash_func, trivial_compare_func);

+        r = hashmap_ensure_allocated(&m->jobs, NULL);

         if (r < 0)

                 goto fail;

-        r = hashmap_ensure_allocated(&m->cgroup_unit, string_hash_func, string_compare_func);

+        r = hashmap_ensure_allocated(&m->cgroup_unit, &string_hash_ops);

         if (r < 0)

                 goto fail;

-        r = hashmap_ensure_allocated(&m->watch_bus, string_hash_func, string_compare_func);

+        r = hashmap_ensure_allocated(&m->watch_bus, &string_hash_ops);

         if (r < 0)

                 goto fail;

-        r = set_ensure_allocated(&m->startup_units, trivial_hash_func, trivial_compare_func);

+        r = set_ensure_allocated(&m->startup_units, NULL);

         if (r < 0)

                 goto fail;

-        r = set_ensure_allocated(&m->failed_units, trivial_hash_func, trivial_compare_func);

+        r = set_ensure_allocated(&m->failed_units, NULL);

         if (r < 0)

                 goto fail;

@@ -903,7 +903,7 @@ static void manager_build_unit_path_cache(Manager *m) {

         set_free_free(m->unit_path_cache);

-        m->unit_path_cache = set_new(string_hash_func, string_compare_func);

+        m->unit_path_cache = set_new(&string_hash_ops);

         if (!m->unit_path_cache) {

                 log_error("Failed to allocate unit path cache.");

                 return;

diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c

index cc2633e3bd..23a66d2e95 100644

--- a/src/core/mount-setup.c

+++ b/src/core/mount-setup.c

@@ -235,7 +235,7 @@ int mount_cgroup_controllers(char ***join_controllers) {

                 return 0;

         }

-        controllers = set_new(string_hash_func, string_compare_func);

+        controllers = set_new(&string_hash_ops);

         if (!controllers)

                 return log_oom();

diff --git a/src/core/swap.c b/src/core/swap.c

index 019d32ed0d..b88a914f72 100644

--- a/src/core/swap.c

+++ b/src/core/swap.c

@@ -77,7 +77,7 @@ static int swap_set_devnode(Swap *s, const char *devnode) {

         assert(s);

-        r = hashmap_ensure_allocated(&UNIT(s)->manager->swaps_by_devnode, string_hash_func, string_compare_func);

+        r = hashmap_ensure_allocated(&UNIT(s)->manager->swaps_by_devnode, &string_hash_ops);

         if (r < 0)

                 return r;

@@ -1226,7 +1226,7 @@ static int swap_following_set(Unit *u, Set **_set) {

                 return 0;

         }

-        set = set_new(NULL, NULL);

+        set = set_new(NULL);

         if (!set)

                 return -ENOMEM;

diff --git a/src/core/transaction.c b/src/core/transaction.c

index 1f4c9ce416..dbb4133fe3 100644

--- a/src/core/transaction.c

+++ b/src/core/transaction.c

@@ -1143,7 +1143,7 @@ Transaction *transaction_new(bool irreversible) {

         if (!tr)

                 return NULL;

-        tr->jobs = hashmap_new(trivial_hash_func, trivial_compare_func);

+        tr->jobs = hashmap_new(NULL);

         if (!tr->jobs) {

                 free(tr);

                 return NULL;

diff --git a/src/core/unit.c b/src/core/unit.c

index b5c3182940..5978e21f56 100644

--- a/src/core/unit.c

+++ b/src/core/unit.c

@@ -81,7 +81,7 @@ Unit *unit_new(Manager *m, size_t size) {

         if (!u)

                 return NULL;

-        u->names = set_new(string_hash_func, string_compare_func);

+        u->names = set_new(&string_hash_ops);

         if (!u->names) {

                 free(u);

                 return NULL;

@@ -1843,17 +1843,17 @@ int unit_watch_pid(Unit *u, pid_t pid) {

         /* Watch a specific PID. We only support one or two units

          * watching each PID for now, not more. */

-        r = set_ensure_allocated(&u->pids, trivial_hash_func, trivial_compare_func);

+        r = set_ensure_allocated(&u->pids, NULL);

         if (r < 0)

                 return r;

-        r = hashmap_ensure_allocated(&u->manager->watch_pids1, trivial_hash_func, trivial_compare_func);

+        r = hashmap_ensure_allocated(&u->manager->watch_pids1, NULL);

         if (r < 0)

                 return r;

         r = hashmap_put(u->manager->watch_pids1, LONG_TO_PTR(pid), u);

         if (r == -EEXIST) {

-                r = hashmap_ensure_allocated(&u->manager->watch_pids2, trivial_hash_func, trivial_compare_func);

+                r = hashmap_ensure_allocated(&u->manager->watch_pids2, NULL);

                 if (r < 0)

                         return r;

@@ -2086,22 +2086,22 @@ int unit_add_dependency(Unit *u, UnitDependency d, Unit *other, bool add_referen

                 return 0;

         }

-        r = set_ensure_allocated(&u->dependencies[d], trivial_hash_func, trivial_compare_func);

+        r = set_ensure_allocated(&u->dependencies[d], NULL);

         if (r < 0)

                 return r;

         if (inverse_table[d] != _UNIT_DEPENDENCY_INVALID) {

-                r = set_ensure_allocated(&other->dependencies[inverse_table[d]], trivial_hash_func, trivial_compare_func);

+                r = set_ensure_allocated(&other->dependencies[inverse_table[d]], NULL);

                 if (r < 0)

                         return r;

         }

         if (add_reference) {

-                r = set_ensure_allocated(&u->dependencies[UNIT_REFERENCES], trivial_hash_func, trivial_compare_func);

+                r = set_ensure_allocated(&u->dependencies[UNIT_REFERENCES], NULL);

                 if (r < 0)

                         return r;

-                r = set_ensure_allocated(&other->dependencies[UNIT_REFERENCED_BY], trivial_hash_func, trivial_compare_func);

+                r = set_ensure_allocated(&other->dependencies[UNIT_REFERENCED_BY], NULL);

                 if (r < 0)

                         return r;

         }

@@ -2847,7 +2847,7 @@ static Set *unit_pid_set(pid_t main_pid, pid_t control_pid) {

         Set *pid_set;

         int r;

-        pid_set = set_new(trivial_hash_func, trivial_compare_func);

+        pid_set = set_new(NULL);

         if (!pid_set)

                 return NULL;

@@ -3385,7 +3385,7 @@ int unit_require_mounts_for(Unit *u, const char *path) {

                         char *q;

                         if (!u->manager->units_requiring_mounts_for) {

-                                u->manager->units_requiring_mounts_for = hashmap_new(string_hash_func, string_compare_func);

+                                u->manager->units_requiring_mounts_for = hashmap_new(&string_hash_ops);

                                 if (!u->manager->units_requiring_mounts_for)

                                         return -ENOMEM;

                         }

@@ -3394,7 +3394,7 @@ int unit_require_mounts_for(Unit *u, const char *path) {

                         if (!q)

                                 return -ENOMEM;

-                        x = set_new(NULL, NULL);

+                        x = set_new(NULL);

                         if (!x) {

                                 free(q);

                                 return -ENOMEM;

diff --git a/src/delta/delta.c b/src/delta/delta.c

index cd8bd35716..91f8592b40 100644

--- a/src/delta/delta.c

+++ b/src/delta/delta.c

@@ -268,7 +268,7 @@ static int enumerate_dir_d(Hashmap *top, Hashmap *bottom, Hashmap *drops, const

                 h = hashmap_get(drops, unit);

                 if (!h) {

-                        h = hashmap_new(string_hash_func, string_compare_func);

+                        h = hashmap_new(&string_hash_ops);

                         if (!h)

                                 return -ENOMEM;

                         hashmap_put(drops, unit, h);

@@ -372,9 +372,9 @@ static int process_suffix(const char *suffix, const char *onlyprefix) {

         dropins = nulstr_contains(have_dropins, suffix);

-        top = hashmap_new(string_hash_func, string_compare_func);

-        bottom = hashmap_new(string_hash_func, string_compare_func);

-        drops = hashmap_new(string_hash_func, string_compare_func);

+        top = hashmap_new(&string_hash_ops);

+        bottom = hashmap_new(&string_hash_ops);

+        drops = hashmap_new(&string_hash_ops);

         if (!top || !bottom || !drops) {

                 r = -ENOMEM;

                 goto finish;

diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c

index 1cc86aeaf3..12de820330 100644

--- a/src/journal-remote/journal-remote.c

+++ b/src/journal-remote/journal-remote.c

@@ -222,20 +222,14 @@ static int open_output(Writer *w, const char* host) {

  **********************************************************************/

 static int init_writer_hashmap(RemoteServer *s) {

-        static const struct {

-                hash_func_t hash_func;

-                compare_func_t compare_func;

-        } functions[] = {

-                [JOURNAL_WRITE_SPLIT_NONE] = {trivial_hash_func,

-                                              trivial_compare_func},

-                [JOURNAL_WRITE_SPLIT_HOST] = {string_hash_func,

-                                              string_compare_func},

+        static const struct hash_ops *hash_ops[] = {

+                [JOURNAL_WRITE_SPLIT_NONE] = NULL,

+                [JOURNAL_WRITE_SPLIT_HOST] = &string_hash_ops,

         };

-        assert(arg_split_mode >= 0 && arg_split_mode < (int) ELEMENTSOF(functions));

+        assert(arg_split_mode >= 0 && arg_split_mode < (int) ELEMENTSOF(hash_ops));

-        s->writers = hashmap_new(functions[arg_split_mode].hash_func,

-                                 functions[arg_split_mode].compare_func);

+        s->writers = hashmap_new(hash_ops[arg_split_mode]);

         if (!s->writers)

                 return log_oom();

@@ -695,7 +689,7 @@ static int setup_microhttpd_server(RemoteServer *s,

                 goto error;

         }

-        r = hashmap_ensure_allocated(&s->daemons, uint64_hash_func, uint64_compare_func);

+        r = hashmap_ensure_allocated(&s->daemons, &uint64_hash_ops);

         if (r < 0) {

                 log_oom();

                 goto error;

diff --git a/src/journal/catalog.c b/src/journal/catalog.c

index f03357dedf..41d450b154 100644

--- a/src/journal/catalog.c

+++ b/src/journal/catalog.c

@@ -64,7 +64,7 @@ typedef struct CatalogItem {

         le64_t offset;

 } CatalogItem;

-unsigned long catalog_hash_func(const void *p, const uint8_t hash_key[HASH_KEY_SIZE]) {

+static unsigned long catalog_hash_func(const void *p, const uint8_t hash_key[HASH_KEY_SIZE]) {

         const CatalogItem *i = p;

         uint64_t u;

         size_t l, sz;

@@ -81,7 +81,7 @@ unsigned long catalog_hash_func(const void *p, const uint8_t hash_key[HASH_KEY_S

         return (unsigned long) u;

 }

-int catalog_compare_func(const void *a, const void *b) {

+static int catalog_compare_func(const void *a, const void *b) {

         const CatalogItem *i = a, *j = b;

         unsigned k;

@@ -95,6 +95,11 @@ int catalog_compare_func(const void *a, const void *b) {

         return strcmp(i->language, j->language);

 }

+const struct hash_ops catalog_hash_ops = {

+        .hash = catalog_hash_func,

+        .compare = catalog_compare_func

+};

+

 static int finish_item(

                 Hashmap *h,

                 struct strbuf *sb,

@@ -407,7 +412,7 @@ int catalog_update(const char* database, const char* root, const char* const* di

         unsigned n;

         long r;

-        h = hashmap_new(catalog_hash_func, catalog_compare_func);

+        h = hashmap_new(&catalog_hash_ops);

         sb = strbuf_new();

         if (!h || !sb) {

diff --git a/src/journal/catalog.h b/src/journal/catalog.h

index fdde67aeed..a72ecf6de7 100644

--- a/src/journal/catalog.h

+++ b/src/journal/catalog.h

@@ -28,11 +28,10 @@

 #include "strbuf.h"

 int catalog_import_file(Hashmap *h, struct strbuf *sb, const char *path);

-unsigned long catalog_hash_func(const void *p, const uint8_t hash_key[HASH_KEY_SIZE]);

-int catalog_compare_func(const void *a, const void *b) _pure_;

 int catalog_update(const char* database, const char* root, const char* const* dirs);

 int catalog_get(const char* database, sd_id128_t id, char **data);

 int catalog_list(FILE *f, const char* database, bool oneline);

 int catalog_list_items(FILE *f, const char* database, bool oneline, char **items);

 int catalog_file_lang(const char *filename, char **lang);

 extern const char * const catalog_file_dirs[];

+extern const struct hash_ops catalog_hash_ops;

diff --git a/src/journal/coredump-vacuum.c b/src/journal/coredump-vacuum.c

index 125bb3a4b8..fec901e8e4 100644

--- a/src/journal/coredump-vacuum.c

+++ b/src/journal/coredump-vacuum.c

@@ -194,7 +194,7 @@ int coredump_vacuum(int exclude_fd, off_t keep_free, off_t max_use) {

                             exclude_st.st_ino == st.st_ino)

                                 continue;

-                        r = hashmap_ensure_allocated(&h, NULL, NULL);

+                        r = hashmap_ensure_allocated(&h, NULL);

                         if (r < 0)

                                 return log_oom();

diff --git a/src/journal/coredumpctl.c b/src/journal/coredumpctl.c

index 34dcae87c0..d4756fe67d 100644

--- a/src/journal/coredumpctl.c

+++ b/src/journal/coredumpctl.c

@@ -58,7 +58,7 @@ static Set *new_matches(void) {

         char *tmp;

         int r;

-        set = set_new(trivial_hash_func, trivial_compare_func);

+        set = set_new(NULL);

         if (!set) {

                 log_oom();

                 return NULL;

diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c

index 7286e14ddb..f25cda6ddc 100644

--- a/src/journal/journal-file.c

+++ b/src/journal/journal-file.c

@@ -2498,7 +2498,7 @@ int journal_file_open(

                 goto fail;

         }

-        f->chain_cache = hashmap_new(uint64_hash_func, uint64_compare_func);

+        f->chain_cache = hashmap_new(&uint64_hash_ops);

         if (!f->chain_cache) {

                 r = -ENOMEM;

                 goto fail;

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c

index d00a815ba9..47206d383a 100644

--- a/src/journal/journalctl.c

+++ b/src/journal/journalctl.c

@@ -1029,7 +1029,7 @@ static int get_possible_units(sd_journal *j,

         const char *field;

         int r;

-        found = set_new(string_hash_func, string_compare_func);

+        found = set_new(&string_hash_ops);

         if (!found)

                 return log_oom();

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c

index 01da38b8d8..3df7416397 100644

--- a/src/journal/journald-server.c

+++ b/src/journal/journald-server.c

@@ -1483,7 +1483,7 @@ int server_init(Server *s) {

         mkdir_p("/run/systemd/journal", 0755);

-        s->user_journals = hashmap_new(trivial_hash_func, trivial_compare_func);

+        s->user_journals = hashmap_new(NULL);

         if (!s->user_journals)

                 return log_oom();

diff --git a/src/journal/mmap-cache.c b/src/journal/mmap-cache.c

index 908562da27..2d268fc332 100644

--- a/src/journal/mmap-cache.c

+++ b/src/journal/mmap-cache.c

@@ -227,7 +227,7 @@ static Context *context_add(MMapCache *m, unsigned id) {

         if (c)

                 return c;

-        r = hashmap_ensure_allocated(&m->contexts, trivial_hash_func, trivial_compare_func);

+        r = hashmap_ensure_allocated(&m->contexts, NULL);

         if (r < 0)

                 return NULL;

@@ -281,7 +281,7 @@ static FileDescriptor* fd_add(MMapCache *m, int fd) {

         if (f)

                 return f;

-        r = hashmap_ensure_allocated(&m->fds, trivial_hash_func, trivial_compare_func);

+        r = hashmap_ensure_allocated(&m->fds, NULL);

         if (r < 0)

                 return NULL;

diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c

index 693707cb34..1fc9f01d0a 100644

--- a/src/journal/sd-journal.c

+++ b/src/journal/sd-journal.c

@@ -70,7 +70,7 @@ static int set_put_error(sd_journal *j, int r) {

         if (r >= 0)

                 return r;

-        k = set_ensure_allocated(&j->errors, trivial_hash_func, trivial_compare_func);

+        k = set_ensure_allocated(&j->errors, NULL);

         if (k < 0)

                 return k;

@@ -1662,7 +1662,7 @@ static int allocate_inotify(sd_journal *j) {

         }

         if (!j->directories_by_wd) {

-                j->directories_by_wd = hashmap_new(trivial_hash_func, trivial_compare_func);

+                j->directories_by_wd = hashmap_new(NULL);

                 if (!j->directories_by_wd)

                         return -ENOMEM;

         }

@@ -1688,8 +1688,8 @@ static sd_journal *journal_new(int flags, const char *path) {

                         goto fail;

         }

-        j->files = hashmap_new(string_hash_func, string_compare_func);

-        j->directories_by_path = hashmap_new(string_hash_func, string_compare_func);

+        j->files = hashmap_new(&string_hash_ops);

+        j->directories_by_path = hashmap_new(&string_hash_ops);

         j->mmap = mmap_cache_new();

         if (!j->files || !j->directories_by_path || !j->mmap)

                 goto fail;

diff --git a/src/journal/test-catalog.c b/src/journal/test-catalog.c

index 967ab6756b..5fe2f6a269 100644

--- a/src/journal/test-catalog.c

+++ b/src/journal/test-catalog.c

@@ -62,7 +62,7 @@ static void test_catalog_importing(void) {

         Hashmap *h;

         struct strbuf *sb;

-        assert_se(h = hashmap_new(catalog_hash_func, catalog_compare_func));

+        assert_se(h = hashmap_new(&catalog_hash_ops));

         assert_se(sb = strbuf_new());

 #define BUF "xxx"

diff --git a/src/libsystemd-network/sd-dhcp-server.c b/src/libsystemd-network/sd-dhcp-server.c

index ab683228b4..a6d6178e72 100644

--- a/src/libsystemd-network/sd-dhcp-server.c

+++ b/src/libsystemd-network/sd-dhcp-server.c

@@ -109,6 +109,11 @@ int client_id_compare_func(const void *_a, const void *_b) {

         return memcmp(a->data, b->data, a->length);

 }

+static const struct hash_ops client_id_hash_ops = {

+        .hash = client_id_hash_func,

+        .compare = client_id_compare_func

+};

+

 static void dhcp_lease_free(DHCPLease *lease) {

         if (!lease)

                 return;

@@ -158,8 +163,7 @@ int sd_dhcp_server_new(sd_dhcp_server **ret, int ifindex) {

         server->address = htobe32(INADDR_ANY);

         server->netmask = htobe32(INADDR_ANY);

         server->index = ifindex;

-        server->leases_by_client_id = hashmap_new(client_id_hash_func,

-                                                  client_id_compare_func);

+        server->leases_by_client_id = hashmap_new(&client_id_hash_ops);

         *ret = server;

         server = NULL;

diff --git a/src/libsystemd/sd-bus/bus-match.c b/src/libsystemd/sd-bus/bus-match.c

index 88b61a75be..18afe0f12a 100644

--- a/src/libsystemd/sd-bus/bus-match.c

+++ b/src/libsystemd/sd-bus/bus-match.c

@@ -450,13 +450,13 @@ static int bus_match_add_compare_value(

                 where->child = c;

                 if (t == BUS_MATCH_MESSAGE_TYPE) {

-                        c->compare.children = hashmap_new(trivial_hash_func, trivial_compare_func);

+                        c->compare.children = hashmap_new(NULL);

                         if (!c->compare.children) {

                                 r = -ENOMEM;

                                 goto fail;

                         }

                 } else if (BUS_MATCH_CAN_HASH(t)) {

-                        c->compare.children = hashmap_new(string_hash_func, string_compare_func);

+                        c->compare.children = hashmap_new(&string_hash_ops);

                         if (!c->compare.children) {

                                 r = -ENOMEM;

                                 goto fail;

diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c

index 3a2de6520e..81c840f129 100644

--- a/src/libsystemd/sd-bus/bus-objects.c

+++ b/src/libsystemd/sd-bus/bus-objects.c

@@ -225,7 +225,7 @@ static int get_child_nodes(

         assert(n);

         assert(_s);

-        s = set_new(string_hash_func, string_compare_func);

+        s = set_new(&string_hash_ops);

         if (!s)

                 return -ENOMEM;

@@ -1420,7 +1420,7 @@ static struct node *bus_node_allocate(sd_bus *bus, const char *path) {

         if (n)

                 return n;

-        r = hashmap_ensure_allocated(&bus->nodes, string_hash_func, string_compare_func);

+        r = hashmap_ensure_allocated(&bus->nodes, &string_hash_ops);

         if (r < 0)

                 return NULL;

@@ -1590,6 +1590,11 @@ static int vtable_member_compare_func(const void *a, const void *b) {

         return strcmp(x->member, y->member);

 }

+static const struct hash_ops vtable_member_hash_ops = {

+        .hash = vtable_member_hash_func,

+        .compare = vtable_member_compare_func

+};

+

 static int add_object_vtable_internal(

                 sd_bus *bus,

                 sd_bus_slot **slot,

@@ -1618,11 +1623,11 @@ static int add_object_vtable_internal(

                       !streq(interface, "org.freedesktop.DBus.Peer") &&

                       !streq(interface, "org.freedesktop.DBus.ObjectManager"), -EINVAL);

-        r = hashmap_ensure_allocated(&bus->vtable_methods, vtable_member_hash_func, vtable_member_compare_func);

+        r = hashmap_ensure_allocated(&bus->vtable_methods, &vtable_member_hash_ops);

         if (r < 0)

                 return r;

-        r = hashmap_ensure_allocated(&bus->vtable_properties, vtable_member_hash_func, vtable_member_compare_func);

+        r = hashmap_ensure_allocated(&bus->vtable_properties, &vtable_member_hash_ops);

         if (r < 0)

                 return r;

diff --git a/src/libsystemd/sd-bus/bus-track.c b/src/libsystemd/sd-bus/bus-track.c

index ffa2cf3d75..0a3322a4ee 100644

--- a/src/libsystemd/sd-bus/bus-track.c

+++ b/src/libsystemd/sd-bus/bus-track.c

@@ -166,7 +166,7 @@ _public_ int sd_bus_track_add_name(sd_bus_track *track, const char *name) {

         assert_return(track, -EINVAL);

         assert_return(service_name_is_valid(name), -EINVAL);

-        r = hashmap_ensure_allocated(&track->names, string_hash_func, string_compare_func);

+        r = hashmap_ensure_allocated(&track->names, &string_hash_ops);

         if (r < 0)

                 return r;

diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c

index a85d36180e..7c6da60cca 100644

--- a/src/libsystemd/sd-bus/bus-util.c

+++ b/src/libsystemd/sd-bus/bus-util.c

@@ -399,7 +399,7 @@ int bus_verify_polkit_async(

         if (!sender)

                 return -EBADMSG;

-        r = hashmap_ensure_allocated(registry, trivial_hash_func, trivial_compare_func);

+        r = hashmap_ensure_allocated(registry, NULL);

         if (r < 0)

                 return r;

diff --git a/src/libsystemd/sd-bus/busctl.c b/src/libsystemd/sd-bus/busctl.c

index af71804410..f06b74505b 100644

--- a/src/libsystemd/sd-bus/busctl.c

+++ b/src/libsystemd/sd-bus/busctl.c

@@ -76,7 +76,7 @@ static int list_bus_names(sd_bus *bus, char **argv) {

         pager_open_if_enabled();

-        names = hashmap_new(string_hash_func, string_compare_func);

+        names = hashmap_new(&string_hash_ops);

         if (!names)

                 return log_oom();

diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c

index 83b3aa1c3c..33b65aba72 100644

--- a/src/libsystemd/sd-bus/sd-bus.c

+++ b/src/libsystemd/sd-bus/sd-bus.c

@@ -1756,7 +1756,7 @@ _public_ int sd_bus_call_async(

         if (!BUS_IS_OPEN(bus->state))

                 return -ENOTCONN;

-        r = hashmap_ensure_allocated(&bus->reply_callbacks, uint64_hash_func, uint64_compare_func);

+        r = hashmap_ensure_allocated(&bus->reply_callbacks, &uint64_hash_ops);

         if (r < 0)

                 return r;

diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c

index 985ff2829b..b56182dda7 100644