Skip to content

Make callback handling safer #272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
blairsteven wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make callback handling safer #272

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions callbacks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ cb_create (struct callback_node *tree_root, const char *guid, const char *path,
cb->id = id;
cb->uri = g_strdup_printf (APTERYX_SERVER ".%" PRIu64, cb->id);
cb->ref = callback;
cb->refcnt = 1;
g_atomic_int_set (&cb->refcnt, 1);

cb->refcnt++;
g_atomic_int_inc (&cb->refcnt);
cb->type = cb->path[strlen (cb->path) - 1];

char *tmp = strdup (path);
Expand Down Expand Up @@ -121,7 +121,7 @@ cb_node_remove (struct callback_node *node)
static void
cb_ref (cb_info_t *cb, void *unused)
{
cb->refcnt++;
g_atomic_int_inc (&cb->refcnt);
return;
}

Expand Down Expand Up @@ -179,21 +179,29 @@ cb_disable (cb_info_t *cb)
}

void
cb_release (cb_info_t *cb)
cb_release_no_lock (cb_info_t *cb)
{
if (!cb)
{
return;
}
cb->refcnt--;

if (cb->refcnt <= 0)
if (g_atomic_int_dec_and_test (&cb->refcnt))
{
cb_free (cb, NULL);
}
}


void
cb_release (cb_info_t *cb)
{
pthread_mutex_lock (&tree_lock);
cb_release_no_lock (cb);
pthread_mutex_unlock (&tree_lock);
}


static GList *
cb_gather_search (struct callback_node *node, GList *callbacks_so_far, const char *path)
{
Expand Down Expand Up @@ -409,9 +417,9 @@ cb_tree_destroy (struct callback_node *node)
/* Calling cb_release will alter these lists (and free them) - so we need
* to pass a copy.
*/
g_list_free_full (g_list_copy (node->directory), (GDestroyNotify) cb_release);
g_list_free_full (g_list_copy (node->exact), (GDestroyNotify) cb_release);
g_list_free_full (g_list_copy (node->following), (GDestroyNotify) cb_release);
g_list_free_full (g_list_copy (node->directory), (GDestroyNotify) cb_release_no_lock);
g_list_free_full (g_list_copy (node->exact), (GDestroyNotify) cb_release_no_lock);
g_list_free_full (g_list_copy (node->following), (GDestroyNotify) cb_release_no_lock);

/* This must be called before hashtree_node_delete */
g_list_free_full (list, (GDestroyNotify) cb_tree_destroy);
Expand Down Expand Up @@ -535,7 +543,7 @@ test_cb_release ()
struct callback_node *watch_list = cb_init ();
cb = cb_create (watch_list, "abc", "/test", 1, 0);
cb_release (cb);
CU_ASSERT (cb->refcnt == 1);
CU_ASSERT (g_atomic_int_get (&cb->refcnt) == 1);
cb_release (cb);
CU_ASSERT (hashtree_empty (&watch_list->hashtree_node));
cb_shutdown (watch_list);
Expand Down