<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13183">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">slotmap: Add _slotmap_del() for callers that already have a lock<br><br>Change-Id: Id05872c3676d0afe4c7abe74677fee62b4f03e53<br>---<br>M src/slotmap.c<br>M src/slotmap.h<br>2 files changed, 9 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/83/13183/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/slotmap.c b/src/slotmap.c</span><br><span>index 703dd02..aa03638 100644</span><br><span>--- a/src/slotmap.c</span><br><span>+++ b/src/slotmap.c</span><br><span>@@ -115,21 +115,26 @@</span><br><span> }</span><br><span> </span><br><span> /* thread-safe removal of a bank<->client map */</span><br><span style="color: hsl(0, 100%, 40%);">-void slotmap_del(struct slotmaps *maps, struct slot_mapping *map)</span><br><span style="color: hsl(120, 100%, 40%);">+void _slotmap_del(struct slotmaps *maps, struct slot_mapping *map)</span><br><span> {</span><br><span>        char mapname[64];</span><br><span> </span><br><span>        printf("Slot Map %s deleted\n", slotmap_name(mapname, sizeof(mapname), map));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     pthread_rwlock_wrlock(&maps->rwlock);</span><br><span>         llist_del(&map->list);</span><br><span> #ifdef REMSIM_SERVER</span><br><span>        llist_del(&map->bank_list);</span><br><span> #endif</span><br><span style="color: hsl(0, 100%, 40%);">-    pthread_rwlock_unlock(&maps->rwlock);</span><br><span> </span><br><span>     talloc_free(map);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+/* thread-safe removal of a bank<->client map */</span><br><span style="color: hsl(120, 100%, 40%);">+void slotmap_del(struct slotmaps *maps, struct slot_mapping *map)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+  pthread_rwlock_wrlock(&maps->rwlock);</span><br><span style="color: hsl(120, 100%, 40%);">+  _slotmap_del(maps, map);</span><br><span style="color: hsl(120, 100%, 40%);">+      pthread_rwlock_unlock(&maps->rwlock);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span> struct slotmaps *slotmap_init(void *ctx)</span><br><span> {</span><br><span>diff --git a/src/slotmap.h b/src/slotmap.h</span><br><span>index a26de6d..3eb976f 100644</span><br><span>--- a/src/slotmap.h</span><br><span>+++ b/src/slotmap.h</span><br><span>@@ -81,6 +81,7 @@</span><br><span> </span><br><span> /* thread-safe removal of a bank<->client map */</span><br><span> void slotmap_del(struct slotmaps *maps, struct slot_mapping *map);</span><br><span style="color: hsl(120, 100%, 40%);">+void _slotmap_del(struct slotmaps *maps, struct slot_mapping *map);</span><br><span> </span><br><span> /* initialize the entire map collection */</span><br><span> struct slotmaps *slotmap_init(void *ctx);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13183">change 13183</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/13183"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Id05872c3676d0afe4c7abe74677fee62b4f03e53 </div>
<div style="display:none"> Gerrit-Change-Number: 13183 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>