packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[TSAN] Rework assertions to always access refcount atomically 

`-fsanitize=address` complained that the `refcount > 0` assertions
were reading without atomics.  We can fix this by reworking them
to read the previous value.

Closes: #582
Approved by: jlebon
This commit is contained in:
Colin Walters 2016-11-17 11:40:59 -05:00 committed by Atomic Bot
parent f0519e541f
commit c1c70bceb7
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/libostree/ostree-fetcher.c
View File

@ -128,11 +128,10 @@ G_DEFINE_TYPE (OstreeFetcher, _ostree_fetcher, G_TYPE_OBJECT)
static ThreadClosure * static ThreadClosure *
thread_closure_ref (ThreadClosure *thread_closure) thread_closure_ref (ThreadClosure *thread_closure)
{ {
int refcount;
g_return_val_if_fail (thread_closure != NULL, NULL); g_return_val_if_fail (thread_closure != NULL, NULL);
g_return_val_if_fail (thread_closure->ref_count > 0, NULL); refcount = g_atomic_int_add (&thread_closure->ref_count, 1);
g_assert (refcount > 0);
g_atomic_int_inc (&thread_closure->ref_count);
return thread_closure; return thread_closure;
} }
@ -140,7 +139,6 @@ static void
thread_closure_unref (ThreadClosure *thread_closure) thread_closure_unref (ThreadClosure *thread_closure)
{ {
g_return_if_fail (thread_closure != NULL); g_return_if_fail (thread_closure != NULL);
g_return_if_fail (thread_closure->ref_count > 0);
if (g_atomic_int_dec_and_test (&thread_closure->ref_count)) if (g_atomic_int_dec_and_test (&thread_closure->ref_count))
{ {
@ -197,11 +195,10 @@ pending_task_compare (gconstpointer a,
static OstreeFetcherPendingURI * static OstreeFetcherPendingURI *
pending_uri_ref (OstreeFetcherPendingURI *pending) pending_uri_ref (OstreeFetcherPendingURI *pending)
{ {
gint refcount;
g_return_val_if_fail (pending != NULL, NULL); g_return_val_if_fail (pending != NULL, NULL);
g_return_val_if_fail (pending->ref_count > 0, NULL); refcount = g_atomic_int_add (&pending->ref_count, 1);
g_assert (refcount > 0);
g_atomic_int_inc (&pending->ref_count);
return pending; return pending;
} }

3
src/libostree/ostree-repo-commit.c
View File

@ -2959,7 +2959,8 @@ ostree_repo_commit_modifier_new (OstreeRepoCommitModifierFlags flags,
OstreeRepoCommitModifier * OstreeRepoCommitModifier *
ostree_repo_commit_modifier_ref (OstreeRepoCommitModifier *modifier) ostree_repo_commit_modifier_ref (OstreeRepoCommitModifier *modifier)
{ {
g_atomic_int_inc (&modifier->refcount); gint refcount = g_atomic_int_add (&modifier->refcount, 1);
g_assert (refcount > 0);
return modifier; return modifier;
} }

7
src/libostree/ostree-repo.c
View File

@ -161,11 +161,10 @@ ost_remote_new_from_keyfile (GKeyFile *keyfile,
static OstreeRemote * static OstreeRemote *
ost_remote_ref (OstreeRemote *remote) ost_remote_ref (OstreeRemote *remote)
{ {
gint refcount;
g_return_val_if_fail (remote != NULL, NULL); g_return_val_if_fail (remote != NULL, NULL);
g_return_val_if_fail (remote->ref_count > 0, NULL); refcount = g_atomic_int_add (&remote->ref_count, 1);
g_assert (refcount > 0);
g_atomic_int_inc (&remote->ref_count);
return remote; return remote;
} }