fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-09 07:08:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm: make NMLldpNeighbor ref-counting thread-safe

Browse source 
At least ref-counting should be thread safe for our public API.

Note that NMLldpNeighbor has no public API for mutating a neighbor
instance. Especially for immutable types, it is very attractive that
ref-counting is thread-safe.

Also use slice allocator for NMLldpNeighbor structs.
This commit is contained in:
Thomas Haller 2021-03-11 08:24:47 +01:00
parent cc7bf676eb
commit f8e19f805f
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/libnm-client-impl/nm-device.c
View file

@ -134,7 +134,7 @@ static NMLldpNeighbor *nm_lldp_neighbor_dup(NMLldpNeighbor *neighbor);
/*****************************************************************************/ /*****************************************************************************/
struct _NMLldpNeighbor { struct _NMLldpNeighbor {
guint refcount; int refcount;
GHashTable *attrs; GHashTable *attrs;
}; };
@ -2881,10 +2881,14 @@ nm_lldp_neighbor_new(void)
{ {
NMLldpNeighbor *neigh; NMLldpNeighbor *neigh;
neigh = g_new0(NMLldpNeighbor, 1); neigh = g_slice_new(NMLldpNeighbor);
neigh->refcount = 1; *neigh = (NMLldpNeighbor){
neigh->attrs = .refcount = 1,
g_hash_table_new_full(nm_str_hash, g_str_equal, g_free, (GDestroyNotify) g_variant_unref); .attrs = g_hash_table_new_full(nm_str_hash,
g_str_equal,
g_free,
(GDestroyNotify) g_variant_unref),
};
return neigh; return neigh;
} }
@ -2912,6 +2916,8 @@ nm_lldp_neighbor_dup(NMLldpNeighbor *neighbor)
* *
* Increases the reference count of the object. * Increases the reference count of the object.
* *
* Since 1.32, ref-counting of #NMLldpNeighbor is thread-safe.
*
* Since: 1.2 * Since: 1.2
**/ **/
void void
@ -2919,7 +2925,7 @@ nm_lldp_neighbor_ref(NMLldpNeighbor *neighbor)
{ {
g_return_if_fail(NM_IS_LLDP_NEIGHBOR(neighbor)); g_return_if_fail(NM_IS_LLDP_NEIGHBOR(neighbor));
neighbor->refcount++; g_atomic_int_inc(&neighbor->refcount);
} }
/** /**
@ -2929,6 +2935,8 @@ nm_lldp_neighbor_ref(NMLldpNeighbor *neighbor)
* Decreases the reference count of the object. If the reference count * Decreases the reference count of the object. If the reference count
* reaches zero, the object will be destroyed. * reaches zero, the object will be destroyed.
* *
* Since 1.32, ref-counting of #NMLldpNeighbor is thread-safe.
*
* Since: 1.2 * Since: 1.2
**/ **/
void void
@ -2936,9 +2944,9 @@ nm_lldp_neighbor_unref(NMLldpNeighbor *neighbor)
{ {
g_return_if_fail(NM_IS_LLDP_NEIGHBOR(neighbor)); g_return_if_fail(NM_IS_LLDP_NEIGHBOR(neighbor));
if (--neighbor->refcount == 0) { if (g_atomic_int_dec_and_test(&neighbor->refcount)) {
g_hash_table_unref(neighbor->attrs); g_hash_table_unref(neighbor->attrs);
g_free(neighbor); nm_g_slice_free(neighbor);
} }
} }