shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-11 05:17:44 +03:00
Code

sd-lldp-rx: delay allocating hashmap and prioq to store neighbors

Browse Source
This commit is contained in:
Yu Watanabe 2021-09-28 15:19:39 +09:00
parent 5bff20ea62
commit b0a67b202d
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/libsystemd-network/sd-lldp-rx.c
View File

@ -147,11 +147,11 @@ static int lldp_rx_add_neighbor(sd_lldp_rx *lldp_rx, sd_lldp_neighbor *n) {
/* Then, make room for at least one new neighbor */ /* Then, make room for at least one new neighbor */
lldp_rx_make_space(lldp_rx, 1); lldp_rx_make_space(lldp_rx, 1);
r = hashmap_put(lldp_rx->neighbor_by_id, &n->id, n); r = hashmap_ensure_put(&lldp_rx->neighbor_by_id, &lldp_neighbor_hash_ops, &n->id, n);
if (r < 0) if (r < 0)
goto finish; goto finish;
r = prioq_put(lldp_rx->neighbor_by_expiry, n, &n->prioq_idx); r = prioq_ensure_put(&lldp_rx->neighbor_by_expiry, lldp_neighbor_prioq_compare_func, n, &n->prioq_idx);
if (r < 0) { if (r < 0) {
assert_se(hashmap_remove(lldp_rx->neighbor_by_id, &n->id) == n); assert_se(hashmap_remove(lldp_rx->neighbor_by_id, &n->id) == n);
goto finish; goto finish;
@ -385,7 +385,6 @@ DEFINE_PUBLIC_TRIVIAL_REF_UNREF_FUNC(sd_lldp_rx, sd_lldp_rx, lldp_rx_free);
_public_ int sd_lldp_rx_new(sd_lldp_rx **ret) { _public_ int sd_lldp_rx_new(sd_lldp_rx **ret) {
_cleanup_(sd_lldp_rx_unrefp) sd_lldp_rx *lldp_rx = NULL; _cleanup_(sd_lldp_rx_unrefp) sd_lldp_rx *lldp_rx = NULL;
int r;
assert_return(ret, -EINVAL); assert_return(ret, -EINVAL);
@ -400,16 +399,7 @@ _public_ int sd_lldp_rx_new(sd_lldp_rx **ret) {
.capability_mask = UINT16_MAX, .capability_mask = UINT16_MAX,
}; };
lldp_rx->neighbor_by_id = hashmap_new(&lldp_neighbor_hash_ops);
if (!lldp_rx->neighbor_by_id)
return -ENOMEM;
r = prioq_ensure_allocated(&lldp_rx->neighbor_by_expiry, lldp_neighbor_prioq_compare_func);
if (r < 0)
return r;
*ret = TAKE_PTR(lldp_rx); *ret = TAKE_PTR(lldp_rx);
return 0; return 0;
} }