From 9d4e664f6280cbc6e0c48d59f62ab34887fa1971 Mon Sep 17 00:00:00 2001 From: Corey Farrell Date: Thu, 7 Jul 2016 13:41:25 -0400 Subject: [PATCH] REF_DEBUG: Prevent logging of container node objects. Using AO2_CONTAINER_ALLOC_OPT_DUPS_REPLACE can result in an unref being recorded to the refs log for the node being replaced. This prevents logging of those unrefs since they would produce errors in refcounter.py. ASTERISK-26181 #close Change-Id: Ie4fded84e8a1a58b3a59ce59dfd7eb0da3ddc5d4 --- main/astobj2_hash.c | 4 ++-- main/astobj2_rbtree.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/main/astobj2_hash.c b/main/astobj2_hash.c index 1cd6ee2490..341ff79e06 100644 --- a/main/astobj2_hash.c +++ b/main/astobj2_hash.c @@ -298,7 +298,7 @@ static enum ao2_container_insert hash_ao2_insert_node(struct ao2_container_hash break; case AO2_CONTAINER_ALLOC_OPT_DUPS_REPLACE: SWAP(cur->common.obj, node->common.obj); - ao2_t_ref(node, -1, "Discard the new node."); + __ao2_ref(node, -1); return AO2_CONTAINER_INSERT_NODE_OBJ_REPLACED; } } @@ -331,7 +331,7 @@ static enum ao2_container_insert hash_ao2_insert_node(struct ao2_container_hash break; case AO2_CONTAINER_ALLOC_OPT_DUPS_REPLACE: SWAP(cur->common.obj, node->common.obj); - ao2_t_ref(node, -1, "Discard the new node."); + __ao2_ref(node, -1); return AO2_CONTAINER_INSERT_NODE_OBJ_REPLACED; } } diff --git a/main/astobj2_rbtree.c b/main/astobj2_rbtree.c index d8195d47f5..a8d5e3ac1b 100644 --- a/main/astobj2_rbtree.c +++ b/main/astobj2_rbtree.c @@ -1267,7 +1267,7 @@ static enum ao2_container_insert rb_ao2_insert_node(struct ao2_container_rbtree break; case AO2_CONTAINER_ALLOC_OPT_DUPS_REPLACE: SWAP(cur->common.obj, node->common.obj); - ao2_t_ref(node, -1, "Don't need the new node."); + __ao2_ref(node, -1); return AO2_CONTAINER_INSERT_NODE_OBJ_REPLACED; }