<p>George Joseph <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/10471">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Richard Mudgett: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, approved
George Joseph: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">threadpool: Eliminate pointless AO2 usage.<br><br>thread_worker_pair, set_size_data and task_pushed_data structures are<br>allocated with AO2 objects, passed to a taskprocessor, then released.<br>They never have multiple owners or use locking so AO2 only adds<br>overhead.<br><br>Change-Id: I2204d2615d9d952670fcb48e0a9c0dd1a6ba5036<br>---<br>M main/threadpool.c<br>1 file changed, 40 insertions(+), 16 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/main/threadpool.c b/main/threadpool.c</span><br><span>index e3d0e40..e7abc8f 100644</span><br><span>--- a/main/threadpool.c</span><br><span>+++ b/main/threadpool.c</span><br><span>@@ -200,10 +200,10 @@</span><br><span> /*!</span><br><span> * \brief Destructor for thread_worker_pair</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-static void thread_worker_pair_destructor(void *obj)</span><br><span style="color: hsl(120, 100%, 40%);">+static void thread_worker_pair_free(struct thread_worker_pair *pair)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct thread_worker_pair *pair = obj;</span><br><span> ao2_ref(pair->worker, -1);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_free(pair);</span><br><span> }</span><br><span> </span><br><span> /*!</span><br><span>@@ -214,13 +214,14 @@</span><br><span> static struct thread_worker_pair *thread_worker_pair_alloc(struct ast_threadpool *pool,</span><br><span> struct worker_thread *worker)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct thread_worker_pair *pair = ao2_alloc(sizeof(*pair), thread_worker_pair_destructor);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct thread_worker_pair *pair = ast_malloc(sizeof(*pair));</span><br><span> if (!pair) {</span><br><span> return NULL;</span><br><span> }</span><br><span> pair->pool = pool;</span><br><span> ao2_ref(worker, +1);</span><br><span> pair->worker = worker;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return pair;</span><br><span> }</span><br><span> </span><br><span>@@ -240,7 +241,7 @@</span><br><span> </span><br><span> threadpool_send_state_changed(pair->pool);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ao2_ref(pair, -1);</span><br><span style="color: hsl(120, 100%, 40%);">+ thread_worker_pair_free(pair);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -257,14 +258,19 @@</span><br><span> {</span><br><span> struct thread_worker_pair *pair;</span><br><span> SCOPED_AO2LOCK(lock, pool);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (pool->shutting_down) {</span><br><span> return;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> pair = thread_worker_pair_alloc(pool, worker);</span><br><span> if (!pair) {</span><br><span> return;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- ast_taskprocessor_push(pool->control_tps, queued_active_thread_idle, pair);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ast_taskprocessor_push(pool->control_tps, queued_active_thread_idle, pair)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ thread_worker_pair_free(pair);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> /*!</span><br><span>@@ -282,7 +288,7 @@</span><br><span> ao2_unlink(pair->pool->zombie_threads, pair->worker);</span><br><span> threadpool_send_state_changed(pair->pool);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ao2_ref(pair, -1);</span><br><span style="color: hsl(120, 100%, 40%);">+ thread_worker_pair_free(pair);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -297,14 +303,19 @@</span><br><span> {</span><br><span> struct thread_worker_pair *pair;</span><br><span> SCOPED_AO2LOCK(lock, pool);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (pool->shutting_down) {</span><br><span> return;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> pair = thread_worker_pair_alloc(pool, worker);</span><br><span> if (!pair) {</span><br><span> return;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- ast_taskprocessor_push(pool->control_tps, queued_zombie_thread_dead, pair);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ast_taskprocessor_push(pool->control_tps, queued_zombie_thread_dead, pair)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ thread_worker_pair_free(pair);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> static int queued_idle_thread_dead(void *data)</span><br><span>@@ -314,7 +325,7 @@</span><br><span> ao2_unlink(pair->pool->idle_threads, pair->worker);</span><br><span> threadpool_send_state_changed(pair->pool);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ao2_ref(pair, -1);</span><br><span style="color: hsl(120, 100%, 40%);">+ thread_worker_pair_free(pair);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -323,14 +334,19 @@</span><br><span> {</span><br><span> struct thread_worker_pair *pair;</span><br><span> SCOPED_AO2LOCK(lock, pool);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (pool->shutting_down) {</span><br><span> return;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> pair = thread_worker_pair_alloc(pool, worker);</span><br><span> if (!pair) {</span><br><span> return;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- ast_taskprocessor_push(pool->control_tps, queued_idle_thread_dead, pair);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ast_taskprocessor_push(pool->control_tps, queued_idle_thread_dead, pair)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ thread_worker_pair_free(pair);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> /*!</span><br><span>@@ -447,7 +463,7 @@</span><br><span> static struct task_pushed_data *task_pushed_data_alloc(struct ast_threadpool *pool,</span><br><span> int was_empty)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct task_pushed_data *tpd = ao2_alloc(sizeof(*tpd), NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct task_pushed_data *tpd = ast_malloc(sizeof(*tpd));</span><br><span> </span><br><span> if (!tpd) {</span><br><span> return NULL;</span><br><span>@@ -549,6 +565,8 @@</span><br><span> int was_empty = tpd->was_empty;</span><br><span> unsigned int existing_active;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ ast_free(tpd);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (pool->listener && pool->listener->callbacks->task_pushed) {</span><br><span> pool->listener->callbacks->task_pushed(pool, pool->listener, was_empty);</span><br><span> }</span><br><span>@@ -565,7 +583,6 @@</span><br><span> /* If no idle threads could be transitioned to active grow the pool as permitted. */</span><br><span> if (ao2_container_count(pool->active_threads) == existing_active) {</span><br><span> if (!pool->options.auto_increment) {</span><br><span style="color: hsl(0, 100%, 40%);">- ao2_ref(tpd, -1);</span><br><span> return 0;</span><br><span> }</span><br><span> grow(pool, pool->options.auto_increment);</span><br><span>@@ -575,7 +592,6 @@</span><br><span> }</span><br><span> </span><br><span> threadpool_send_state_changed(pool);</span><br><span style="color: hsl(0, 100%, 40%);">- ao2_ref(tpd, -1);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -598,12 +614,15 @@</span><br><span> if (pool->shutting_down) {</span><br><span> return;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> tpd = task_pushed_data_alloc(pool, was_empty);</span><br><span> if (!tpd) {</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ast_taskprocessor_push(pool->control_tps, queued_task_pushed, tpd);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ast_taskprocessor_push(pool->control_tps, queued_task_pushed, tpd)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_free(tpd);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> /*!</span><br><span>@@ -790,7 +809,7 @@</span><br><span> static struct set_size_data *set_size_data_alloc(struct ast_threadpool *pool,</span><br><span> unsigned int size)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct set_size_data *ssd = ao2_alloc(sizeof(*ssd), NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct set_size_data *ssd = ast_malloc(sizeof(*ssd));</span><br><span> if (!ssd) {</span><br><span> return NULL;</span><br><span> }</span><br><span>@@ -813,7 +832,7 @@</span><br><span> */</span><br><span> static int queued_set_size(void *data)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- RAII_VAR(struct set_size_data *, ssd, data, ao2_cleanup);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct set_size_data *ssd = data;</span><br><span> struct ast_threadpool *pool = ssd->pool;</span><br><span> unsigned int num_threads = ssd->size;</span><br><span> </span><br><span>@@ -821,6 +840,8 @@</span><br><span> unsigned int current_size = ao2_container_count(pool->active_threads) +</span><br><span> ao2_container_count(pool->idle_threads);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ ast_free(ssd);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (current_size == num_threads) {</span><br><span> ast_debug(3, "Not changing threadpool size since new size %u is the same as current %u\n",</span><br><span> num_threads, current_size);</span><br><span>@@ -849,6 +870,7 @@</span><br><span> {</span><br><span> struct set_size_data *ssd;</span><br><span> SCOPED_AO2LOCK(lock, pool);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (pool->shutting_down) {</span><br><span> return;</span><br><span> }</span><br><span>@@ -858,7 +880,9 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ast_taskprocessor_push(pool->control_tps, queued_set_size, ssd);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ast_taskprocessor_push(pool->control_tps, queued_set_size, ssd)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_free(ssd);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> struct ast_threadpool_listener *ast_threadpool_listener_alloc(</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/10471">change 10471</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/10471"/><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: I2204d2615d9d952670fcb48e0a9c0dd1a6ba5036 </div>
<div style="display:none"> Gerrit-Change-Number: 10471 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.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: Richard Mudgett <rmudgett@digium.com> </div>