<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-remsim/+/16477">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bankd_main: Refactor code: bankd_srvc_remove_mapping()<br><br>Change-Id: Iceb1d015e0ea760cce2cd99bc22ae0149bdb42f1<br>---<br>M src/bankd/bankd_main.c<br>1 file changed, 21 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c</span><br><span>index 9f99f83..7851a2b 100644</span><br><span>--- a/src/bankd/bankd_main.c</span><br><span>+++ b/src/bankd/bankd_main.c</span><br><span>@@ -125,6 +125,26 @@</span><br><span> </span><br><span> static bool terminate = false;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Remove a mapping */</span><br><span style="color: hsl(120, 100%, 40%);">+static void bankd_srvc_remove_mapping(struct slot_mapping *map)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+   struct bank_slot bs = map->bank;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ slotmap_del(g_bankd->slotmaps, map);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+     /* kill/reset the respective worker, if any! */</span><br><span style="color: hsl(120, 100%, 40%);">+       struct bankd_worker *worker;</span><br><span style="color: hsl(120, 100%, 40%);">+  pthread_mutex_lock(&g_bankd->workers_mutex);</span><br><span style="color: hsl(120, 100%, 40%);">+   llist_for_each_entry(worker, &g_bankd->workers, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+                if (bs.bank_id == worker->slot.bank_id &&</span><br><span style="color: hsl(120, 100%, 40%);">+              bs.slot_nr == worker->slot.slot_nr) {</span><br><span style="color: hsl(120, 100%, 40%);">+                  pthread_kill(worker->thread, SIGMAPDEL);</span><br><span style="color: hsl(120, 100%, 40%);">+                   break;</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%);">+     pthread_mutex_unlock(&g_bankd->workers_mutex);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* handle incoming messages from server */</span><br><span> static int bankd_srvc_handle_rx(struct rspro_server_conn *srvc, const RsproPDU_t *pdu)</span><br><span> {</span><br><span>@@ -185,20 +205,8 @@</span><br><span>                               resp = rspro_gen_RemoveMappingRes(ResultCode_unknownSlotmap);</span><br><span>                        } else {</span><br><span>                             LOGPFSM(srvc->fi, "removing slotmap\n");</span><br><span style="color: hsl(0, 100%, 40%);">-                           slotmap_del(g_bankd->slotmaps, map);</span><br><span style="color: hsl(120, 100%, 40%);">+                               bankd_srvc_remove_mapping(map);</span><br><span>                              resp = rspro_gen_RemoveMappingRes(ResultCode_ok);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-                               /* kill/reset the respective worker, if any! */</span><br><span style="color: hsl(0, 100%, 40%);">-                         struct bankd_worker *worker;</span><br><span style="color: hsl(0, 100%, 40%);">-                            pthread_mutex_lock(&g_bankd->workers_mutex);</span><br><span style="color: hsl(0, 100%, 40%);">-                             llist_for_each_entry(worker, &g_bankd->workers, list) {</span><br><span style="color: hsl(0, 100%, 40%);">-                                  if (bs.bank_id == worker->slot.bank_id &&</span><br><span style="color: hsl(0, 100%, 40%);">-                                        bs.slot_nr == worker->slot.slot_nr) {</span><br><span style="color: hsl(0, 100%, 40%);">-                                            pthread_kill(worker->thread, SIGMAPDEL);</span><br><span style="color: hsl(0, 100%, 40%);">-                                             break;</span><br><span style="color: hsl(0, 100%, 40%);">-                                  }</span><br><span style="color: hsl(0, 100%, 40%);">-                               }</span><br><span style="color: hsl(0, 100%, 40%);">-                               pthread_mutex_unlock(&g_bankd->workers_mutex);</span><br><span>                        }</span><br><span>            }</span><br><span>            server_conn_send_rspro(srvc, resp);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-remsim/+/16477">change 16477</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.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.osmocom.org/c/osmo-remsim/+/16477"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-remsim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Iceb1d015e0ea760cce2cd99bc22ae0149bdb42f1 </div>
<div style="display:none"> Gerrit-Change-Number: 16477 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>