diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2016-10-31 11:35:16 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-10-31 11:35:16 -0500 |
| commit | d9cf38dc51cbb1b40a4c0dd17837a5656f1d88d8 (patch) | |
| tree | 09d5c4134910f2c1bc5439465f9e89036981c89d | |
| parent | 273debd261148dcc0962566d83ee9c601ee5c99c (diff) | |
| parent | ad60927a40cf07bb60225c3613ae92b12aa92101 (diff) | |
Merge "astobj2: Declare private variable data_size for AO2_DEBUG only."
| -rw-r--r-- | main/astobj2.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/main/astobj2.c b/main/astobj2.c index 114f26045..c8e48bbf5 100644 --- a/main/astobj2.c +++ b/main/astobj2.c @@ -52,8 +52,10 @@ struct __priv_data { ao2_destructor_fn destructor_fn; /*! This field is used for astobj2 and ao2_weakproxy objects to reference each other */ void *weakptr; +#if defined(AO2_DEBUG) /*! User data size for stats */ size_t data_size; +#endif /*! The ao2 object option flags */ uint32_t options; /*! magic number. This is used to verify that a pointer passed in is a @@ -669,11 +671,11 @@ static void *internal_ao2_alloc(size_t data_size, ao2_destructor_fn destructor_f /* Initialize common ao2 values. */ obj->priv_data.ref_counter = 1; obj->priv_data.destructor_fn = destructor_fn; /* can be NULL */ - obj->priv_data.data_size = data_size; obj->priv_data.options = options; obj->priv_data.magic = AO2_MAGIC; #ifdef AO2_DEBUG + obj->priv_data.data_size = data_size; ast_atomic_fetchadd_int(&ao2.total_objects, 1); ast_atomic_fetchadd_int(&ao2.total_mem, data_size); ast_atomic_fetchadd_int(&ao2.total_refs, 1); |