<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/10308">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Richard Mudgett: Looks good to me, but someone else must approve
Kevin Harwell: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, approved
Jenkins2: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">astobj2: Reduce memory overhead.<br><br>Reduce options to 2-bit field, magic to 30 bit field. Move ref_counter<br>next to options and explicitly use int32_t so the fields will pack.<br><br>This reduces memory overhead for every ao2 object by 8 bytes on x86_64.<br><br>Change-Id: Idc1baabb35ec3b3d8de463c4fa3011eaf7fcafb5<br>---<br>M main/astobj2.c<br>1 file changed, 13 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/main/astobj2.c b/main/astobj2.c</span><br><span>index 63058e1..ea4ad02 100644</span><br><span>--- a/main/astobj2.c</span><br><span>+++ b/main/astobj2.c</span><br><span>@@ -48,7 +48,6 @@</span><br><span> * The magic number is used for consistency check.</span><br><span> */</span><br><span> struct __priv_data {</span><br><span style="color: hsl(0, 100%, 40%);">- int ref_counter;</span><br><span> ao2_destructor_fn destructor_fn;</span><br><span> /*! This field is used for astobj2 and ao2_weakproxy objects to reference each other */</span><br><span> void *weakptr;</span><br><span>@@ -56,15 +55,17 @@</span><br><span> /*! User data size for stats */</span><br><span> size_t data_size;</span><br><span> #endif</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Number of references held for this object */</span><br><span style="color: hsl(120, 100%, 40%);">+ int32_t ref_counter;</span><br><span> /*! The ao2 object option flags */</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t options;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t options:2;</span><br><span> /*! magic number. This is used to verify that a pointer passed in is a</span><br><span> * valid astobj2 or ao2_weak reference */</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t magic;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t magic:30;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define AO2_MAGIC 0xa570b123</span><br><span style="color: hsl(0, 100%, 40%);">-#define AO2_WEAK 0xa570b122</span><br><span style="color: hsl(120, 100%, 40%);">+#define AO2_MAGIC 0x3a70b123</span><br><span style="color: hsl(120, 100%, 40%);">+#define AO2_WEAK 0x3a70b122</span><br><span> #define IS_AO2_MAGIC_BAD(p) (AO2_MAGIC != (p->priv_data.magic | 1))</span><br><span> </span><br><span> /*!</span><br><span>@@ -465,8 +466,8 @@</span><br><span> struct astobj2_lock *obj_mutex;</span><br><span> struct astobj2_rwlock *obj_rwlock;</span><br><span> struct astobj2_lockobj *obj_lockobj;</span><br><span style="color: hsl(0, 100%, 40%);">- int current_value;</span><br><span style="color: hsl(0, 100%, 40%);">- int ret;</span><br><span style="color: hsl(120, 100%, 40%);">+ int32_t current_value;</span><br><span style="color: hsl(120, 100%, 40%);">+ int32_t ret;</span><br><span> struct ao2_weakproxy *weakproxy = NULL;</span><br><span> </span><br><span> if (obj == NULL) {</span><br><span>@@ -488,7 +489,7 @@</span><br><span> }</span><br><span> </span><br><span> /* we modify with an atomic operation the reference counter */</span><br><span style="color: hsl(0, 100%, 40%);">- ret = ast_atomic_fetchadd_int(&obj->priv_data.ref_counter, delta);</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = ast_atomic_fetch_add(&obj->priv_data.ref_counter, delta, __ATOMIC_RELAXED);</span><br><span> current_value = ret + delta;</span><br><span> </span><br><span> #ifdef AO2_DEBUG</span><br><span>@@ -541,7 +542,7 @@</span><br><span> /* We just reached or went over the excessive ref count trigger */</span><br><span> snprintf(excessive_ref_buf, sizeof(excessive_ref_buf),</span><br><span> "Excessive refcount %d reached on ao2 object %p",</span><br><span style="color: hsl(0, 100%, 40%);">- current_value, user_data);</span><br><span style="color: hsl(120, 100%, 40%);">+ (int)current_value, user_data);</span><br><span> ast_log(__LOG_ERROR, file, line, func, "%s\n", excessive_ref_buf);</span><br><span> </span><br><span> __ast_assert_failed(0, excessive_ref_buf, file, line, func);</span><br><span>@@ -550,7 +551,7 @@</span><br><span> if (ref_log && tag) {</span><br><span> fprintf(ref_log, "%p,%s%d,%d,%s,%d,%s,%d,%s\n", user_data,</span><br><span> (delta < 0 ? "" : "+"), delta, ast_get_tid(),</span><br><span style="color: hsl(0, 100%, 40%);">- file, line, func, ret, tag);</span><br><span style="color: hsl(120, 100%, 40%);">+ file, line, func, (int)ret, tag);</span><br><span> fflush(ref_log);</span><br><span> }</span><br><span> return ret;</span><br><span>@@ -559,7 +560,7 @@</span><br><span> /* this case must never happen */</span><br><span> if (current_value < 0) {</span><br><span> ast_log(__LOG_ERROR, file, line, func,</span><br><span style="color: hsl(0, 100%, 40%);">- "Invalid refcount %d on ao2 object %p\n", current_value, user_data);</span><br><span style="color: hsl(120, 100%, 40%);">+ "Invalid refcount %d on ao2 object %p\n", (int)current_value, user_data);</span><br><span> if (ref_log) {</span><br><span> /* Log to ref_log invalid even if (tag == NULL) */</span><br><span> fprintf(ref_log, "%p,%d,%d,%s,%d,%s,**invalid**,%s\n",</span><br><span>@@ -692,8 +693,8 @@</span><br><span> }</span><br><span> </span><br><span> /* Initialize common ao2 values. */</span><br><span style="color: hsl(0, 100%, 40%);">- obj->priv_data.ref_counter = 1;</span><br><span> obj->priv_data.destructor_fn = destructor_fn; /* can be NULL */</span><br><span style="color: hsl(120, 100%, 40%);">+ obj->priv_data.ref_counter = 1;</span><br><span> obj->priv_data.options = options;</span><br><span> obj->priv_data.magic = AO2_MAGIC;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/10308">change 10308</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/10308"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 16 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Idc1baabb35ec3b3d8de463c4fa3011eaf7fcafb5 </div>
<div style="display:none"> Gerrit-Change-Number: 10308 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 (1000185) </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Richard Mudgett <rmudgett@digium.com> </div>