<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13185">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">slotmap: Introduce slotmap_{rd,wr,un}lock() wrappers for lock debugging<br><br>Change-Id: I8dde90d62e673e60e026979c74074f7084490467<br>---<br>M src/slotmap.c<br>M src/slotmap.h<br>2 files changed, 28 insertions(+), 12 deletions(-)<br><br></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 f4a22e1..9e16fff 100644</span><br><span>--- a/src/slotmap.c</span><br><span>+++ b/src/slotmap.c</span><br><span>@@ -40,14 +40,14 @@</span><br><span> {</span><br><span> struct slot_mapping *map;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- pthread_rwlock_rdlock(&maps->rwlock);</span><br><span style="color: hsl(120, 100%, 40%);">+ slotmaps_rdlock(maps);</span><br><span> llist_for_each_entry(map, &maps->mappings, list) {</span><br><span> if (client_slot_equals(&map->client, client)) {</span><br><span style="color: hsl(0, 100%, 40%);">- pthread_rwlock_unlock(&maps->rwlock);</span><br><span style="color: hsl(120, 100%, 40%);">+ slotmaps_unlock(maps);</span><br><span> return map;</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- pthread_rwlock_unlock(&maps->rwlock);</span><br><span style="color: hsl(120, 100%, 40%);">+ slotmaps_unlock(maps);</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span>@@ -56,14 +56,14 @@</span><br><span> {</span><br><span> struct slot_mapping *map;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- pthread_rwlock_rdlock(&maps->rwlock);</span><br><span style="color: hsl(120, 100%, 40%);">+ slotmaps_rdlock(maps);</span><br><span> llist_for_each_entry(map, &maps->mappings, list) {</span><br><span> if (bank_slot_equals(&map->bank, bank)) {</span><br><span style="color: hsl(0, 100%, 40%);">- pthread_rwlock_unlock(&maps->rwlock);</span><br><span style="color: hsl(120, 100%, 40%);">+ slotmaps_unlock(maps);</span><br><span> return map;</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- pthread_rwlock_unlock(&maps->rwlock);</span><br><span style="color: hsl(120, 100%, 40%);">+ slotmaps_unlock(maps);</span><br><span> return NULL;</span><br><span> </span><br><span> }</span><br><span>@@ -102,13 +102,13 @@</span><br><span> map->bank = *bank;</span><br><span> map->client = *client;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- pthread_rwlock_wrlock(&maps->rwlock);</span><br><span style="color: hsl(120, 100%, 40%);">+ slotmaps_wrlock(maps);</span><br><span> llist_add_tail(&map->list, &maps->mappings);</span><br><span> #ifdef REMSIM_SERVER</span><br><span> map->state = SLMAP_S_NEW;</span><br><span> INIT_LLIST_HEAD(&map->bank_list); /* to ensure llist_del() always succeeds */</span><br><span> #endif</span><br><span style="color: hsl(0, 100%, 40%);">- pthread_rwlock_unlock(&maps->rwlock);</span><br><span style="color: hsl(120, 100%, 40%);">+ slotmaps_unlock(maps);</span><br><span> </span><br><span> printf("Slot Map %s added\n", slotmap_name(mapname, sizeof(mapname), map));</span><br><span> </span><br><span>@@ -132,9 +132,9 @@</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> {</span><br><span style="color: hsl(0, 100%, 40%);">- pthread_rwlock_wrlock(&maps->rwlock);</span><br><span style="color: hsl(120, 100%, 40%);">+ slotmaps_wrlock(maps);</span><br><span> _slotmap_del(maps, map);</span><br><span style="color: hsl(0, 100%, 40%);">- pthread_rwlock_unlock(&maps->rwlock);</span><br><span style="color: hsl(120, 100%, 40%);">+ slotmaps_unlock(maps);</span><br><span> }</span><br><span> </span><br><span> struct slotmaps *slotmap_init(void *ctx)</span><br><span>@@ -171,9 +171,9 @@</span><br><span> void Slotmap_state_change(struct slot_mapping *map, enum slot_mapping_state new_state,</span><br><span> struct llist_head *new_bank_list, const char *file, int line)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- pthread_rwlock_wrlock(&map->maps->rwlock);</span><br><span style="color: hsl(120, 100%, 40%);">+ slotmaps_wrlock(map->maps);</span><br><span> _Slotmap_state_change(map, new_state, new_bank_list, file, line);</span><br><span style="color: hsl(0, 100%, 40%);">- pthread_rwlock_unlock(&map->maps->rwlock);</span><br><span style="color: hsl(120, 100%, 40%);">+ slotmaps_unlock(map->maps);</span><br><span> }</span><br><span> </span><br><span> #endif</span><br><span>diff --git a/src/slotmap.h b/src/slotmap.h</span><br><span>index bc55f29..78dfff9 100644</span><br><span>--- a/src/slotmap.h</span><br><span>+++ b/src/slotmap.h</span><br><span>@@ -86,6 +86,22 @@</span><br><span> /* initialize the entire map collection */</span><br><span> struct slotmaps *slotmap_init(void *ctx);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define slotmaps_rdlock(maps) do { \</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("%s:%u = slotmap_rdlock()\n", __FILE__, __LINE__); \</span><br><span style="color: hsl(120, 100%, 40%);">+ pthread_rwlock_rdlock(&(maps)->rwlock); \</span><br><span style="color: hsl(120, 100%, 40%);">+} while (0)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define slotmaps_wrlock(maps) do { \</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("%s:%u = slotmap_wrlock()\n", __FILE__, __LINE__); \</span><br><span style="color: hsl(120, 100%, 40%);">+ pthread_rwlock_wrlock(&(maps)->rwlock); \</span><br><span style="color: hsl(120, 100%, 40%);">+} while (0)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define slotmaps_unlock(maps) do { \</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("%s:%u = slotmap_unlock()\n", __FILE__, __LINE__); \</span><br><span style="color: hsl(120, 100%, 40%);">+ pthread_rwlock_unlock(&(maps)->rwlock); \</span><br><span style="color: hsl(120, 100%, 40%);">+} while (0)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #ifdef REMSIM_SERVER</span><br><span> void _Slotmap_state_change(struct slot_mapping *map, enum slot_mapping_state new_state,</span><br><span> struct llist_head *new_bank_list, const char *file, int line);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13185">change 13185</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/13185"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: I8dde90d62e673e60e026979c74074f7084490467 </div>
<div style="display:none"> Gerrit-Change-Number: 13185 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>