<p>Kevin Harwell has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/10906">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res_pjsip_registrar: mitigate blocked threads on reliable transport shutdown<br><br>When a reliable transport is shutdown it's possible for the pjsip registrar<br>resource shutdown handler to get called multiple times. If this happens and one<br>of the threads is taking "too long" (slow database call for instance) then the<br>others get blocked waiting to delete.<br><br>Since it only takes one to delete the contact then the other threads should be<br>able to continue on if one of the threads is currently "deleting". This patch<br>makes it so now when a thread enters the shutdown handler it checks to see if a<br>thread is currently already "deleting". If so, then the thread does not attempt<br>to get the lock, and instead continues on thus avoiding the blockage.<br><br>ASTERISK-28213 #close<br><br>Change-Id: I7563ca596312b1dff4f3ab41483e89fe2862328a<br>---<br>M res/res_pjsip_registrar.c<br>1 file changed, 16 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/06/10906/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/res/res_pjsip_registrar.c b/res/res_pjsip_registrar.c</span><br><span>index c16a36f..7db2107 100644</span><br><span>--- a/res/res_pjsip_registrar.c</span><br><span>+++ b/res/res_pjsip_registrar.c</span><br><span>@@ -313,6 +313,7 @@</span><br><span> </span><br><span> /*! Transport monitor for incoming REGISTER contacts */</span><br><span> struct contact_transport_monitor {</span><br><span style="color: hsl(120, 100%, 40%);">+        int removing;</span><br><span>        /*!</span><br><span>   * \brief Sorcery contact name to remove on transport shutdown</span><br><span>        * \note Stored after aor_name in space reserved when struct allocated.</span><br><span>@@ -344,6 +345,16 @@</span><br><span>       }</span><br><span> </span><br><span>        ao2_lock(lock);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+     if (monitor->removing) {</span><br><span style="color: hsl(120, 100%, 40%);">+           ao2_unlock(lock);</span><br><span style="color: hsl(120, 100%, 40%);">+             ast_named_lock_put(lock);</span><br><span style="color: hsl(120, 100%, 40%);">+             ao2_ref(monitor, -1);</span><br><span style="color: hsl(120, 100%, 40%);">+         return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+     }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   monitor->removing = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  contact = ast_sip_location_retrieve_contact(monitor->contact_name);</span><br><span>       if (contact) {</span><br><span>               ast_sip_location_delete_contact(contact);</span><br><span>@@ -358,6 +369,7 @@</span><br><span>                      contact->user_agent);</span><br><span>             ao2_ref(contact, -1);</span><br><span>        }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  ao2_unlock(lock);</span><br><span>    ast_named_lock_put(lock);</span><br><span> </span><br><span>@@ -379,6 +391,10 @@</span><br><span> {</span><br><span>    struct contact_transport_monitor *monitor = data;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (monitor->removing) {</span><br><span style="color: hsl(120, 100%, 40%);">+           return;</span><br><span style="color: hsl(120, 100%, 40%);">+       }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  /*</span><br><span>    * Push off to a default serializer.  This is in case sorcery</span><br><span>         * does database accesses for contacts.  Database accesses may</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/10906">change 10906</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/10906"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I7563ca596312b1dff4f3ab41483e89fe2862328a </div>
<div style="display:none"> Gerrit-Change-Number: 10906 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Kevin Harwell <kharwell@digium.com> </div>