<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-remsim/+/16594">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: Factor out signal-sending from bankd_srvc_remove_mapping()<br><br>This way we can also deliver other signals to workers.<br><br>Change-Id: I86744554187d5bcee75592427990d404889f29fe<br>---<br>M src/bankd/bankd_main.c<br>1 file changed, 19 insertions(+), 10 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 194baef..29a13ed 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,24 @@</span><br><span> </span><br><span> static bool terminate = false;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* deliver given signal 'sig' to the firts worker matching bs and cs (if given) */</span><br><span style="color: hsl(120, 100%, 40%);">+static void send_signal_to_worker(const struct bank_slot *bs, const struct client_slot *cs, int sig)</span><br><span style="color: hsl(120, 100%, 40%);">+{</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 && (bs->bank_id != worker->slot.bank_id || bs->slot_nr != worker->slot.slot_nr))</span><br><span style="color: hsl(120, 100%, 40%);">+                   continue;</span><br><span style="color: hsl(120, 100%, 40%);">+             if (cs && (cs->client_id != worker->client.clslot.client_id ||</span><br><span style="color: hsl(120, 100%, 40%);">+                     cs->slot_nr != worker->client.clslot.slot_nr))</span><br><span style="color: hsl(120, 100%, 40%);">+                       continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+           pthread_kill(worker->thread, sig);</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%);">+     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> /* Remove a mapping */</span><br><span> static void bankd_srvc_remove_mapping(struct slot_mapping *map)</span><br><span> {</span><br><span>@@ -133,16 +151,7 @@</span><br><span>  slotmap_del(g_bankd->slotmaps, map);</span><br><span> </span><br><span>  /* 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 style="color: hsl(120, 100%, 40%);">+ send_signal_to_worker(&bs, NULL, SIGMAPDEL);</span><br><span> }</span><br><span> </span><br><span> /* handle incoming messages from server */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-remsim/+/16594">change 16594</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/+/16594"/><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: I86744554187d5bcee75592427990d404889f29fe </div>
<div style="display:none"> Gerrit-Change-Number: 16594 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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>