astobj2: Additional refactoring to push impl specific code down into the impls.

Move some implementation specific code from astobj2_container.c into
astobj2_hash.c and astobj2_rbtree.c.  This completely removes the need for
astobj2_container to switch on RTTI and it no longer has any knowledge of
the implementation details.

Also adds AO2_DEBUG as a new compile option in menuselect which controls
astobj2 debugging independently of AST_DEVMODE and REF_DEBUG.

Tested by: George Joseph
Review: https://reviewboard.asterisk.org/r/3593/


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@416806 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
George Joseph
2014-06-20 15:22:44 +00:00
parent 43e0a4ddea
commit ae311292d3
7 changed files with 238 additions and 232 deletions

View File

@@ -26,16 +26,11 @@
#include "asterisk/astobj2.h"
#if defined(TEST_FRAMEWORK)
/* We are building with the test framework enabled so enable AO2 debug tests as well. */
#define AO2_DEBUG 1
#endif /* defined(TEST_FRAMEWORK) */
#if defined(AST_DEVMODE)
#if defined(AO2_DEBUG)
#define AO2_DEVMODE_STAT(stat) stat
#else
#define AO2_DEVMODE_STAT(stat)
#endif /* defined(AST_DEVMODE) */
#endif /* defined(AO2_DEBUG) */
#ifdef AO2_DEBUG
struct ao2_stats {
@@ -46,7 +41,7 @@ struct ao2_stats {
volatile int total_locked;
};
extern struct ao2_stats ao2;
#endif
#endif /* defined(AO2_DEBUG) */
int is_ao2_object(void *user_data);
enum ao2_lock_req __adjust_lock(void *user_data, enum ao2_lock_req lock_how, int keep_stronger);