colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shared: refactor nm_assert() for NMRefString

Browse Source 
- also check consistency of the string.

- disable more expensive check unless running with NM_MORE_ASSERTS>10.
This commit is contained in:
Thomas Haller
2021-02-15 10:04:52 +01:00
parent 3ceec9c6ac
commit ac1c66eb34
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
shared/nm-glib-aux/nm-ref-string.c
View File

@@ -49,20 +49,28 @@ _ref_string_equal(gconstpointer pa, gconstpointer pb)
static void static void
_ASSERT(const RefString *rstr0) _ASSERT(const RefString *rstr0)
{ {
#if NM_MORE_ASSERTS
int r; int r;
nm_assert(rstr0); nm_assert(rstr0);
G_LOCK(gl_lock); if (NM_MORE_ASSERTS > 0) {
r = g_atomic_int_get(&rstr0->ref_count); r = g_atomic_int_get(&rstr0->ref_count);
nm_assert(r > 0);
nm_assert(r < G_MAXINT);
}
nm_assert(r > 0); nm_assert(rstr0->r.str == rstr0->str_data);
nm_assert(r < G_MAXINT); nm_assert(rstr0->r.str[rstr0->r.len] == '\0');
nm_assert(rstr0 == g_hash_table_lookup(gl_hash, rstr0)); if (NM_MORE_ASSERTS > 10) {
G_UNLOCK(gl_lock); G_LOCK(gl_lock);
#endif r = g_atomic_int_get(&rstr0->ref_count);
nm_assert(r > 0);
nm_assert(r < G_MAXINT);
nm_assert(rstr0 == g_hash_table_lookup(gl_hash, rstr0));
G_UNLOCK(gl_lock);
}
} }
/** /**