<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13184">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: Log file/line when changing state<br><br>Change-Id: Idc7b350b464ddc50076f92dae592a0d5ad4d486a<br>---<br>M src/debug.h<br>M src/slotmap.c<br>M src/slotmap.h<br>3 files changed, 17 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/debug.h b/src/debug.h</span><br><span>index 02551eb..e3994b4 100644</span><br><span>--- a/src/debug.h</span><br><span>+++ b/src/debug.h</span><br><span>@@ -1,4 +1,5 @@</span><br><span> #pragma once</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/logging.h></span><br><span> </span><br><span> enum {</span><br><span>      DMAIN,</span><br><span>diff --git a/src/slotmap.c b/src/slotmap.c</span><br><span>index aa03638..f4a22e1 100644</span><br><span>--- a/src/slotmap.c</span><br><span>+++ b/src/slotmap.c</span><br><span>@@ -12,6 +12,7 @@</span><br><span> #include <osmocom/core/utils.h></span><br><span> </span><br><span> #include "slotmap.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "debug.h"</span><br><span> </span><br><span> const struct value_string slot_map_state_name[] = {</span><br><span>  { SLMAP_S_NEW,                  "NEW" },</span><br><span>@@ -148,33 +149,30 @@</span><br><span> </span><br><span> #ifdef REMSIM_SERVER</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void _slotmap_state_change(struct slot_mapping *map, enum slot_mapping_state new_state,</span><br><span style="color: hsl(0, 100%, 40%);">-                          struct llist_head *new_bank_list)</span><br><span style="color: hsl(120, 100%, 40%);">+void _Slotmap_state_change(struct slot_mapping *map, enum slot_mapping_state new_state,</span><br><span style="color: hsl(120, 100%, 40%);">+                    struct llist_head *new_bank_list, const char *file, int line)</span><br><span> {</span><br><span>        char mapname[64];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   printf("Slot Map %s state change: %s -> %s\n", slotmap_name(mapname, sizeof(mapname), map),</span><br><span style="color: hsl(120, 100%, 40%);">+      LOGPSRC(DMAIN, LOGL_INFO, file, line, "Slot Map %s state change: %s -> %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+            slotmap_name(mapname, sizeof(mapname), map),</span><br><span>                 get_value_string(slot_map_state_name, map->state),</span><br><span>                get_value_string(slot_map_state_name, new_state));</span><br><span> </span><br><span>       map->state = new_state;</span><br><span style="color: hsl(0, 100%, 40%);">-#ifdef REMSIM_SERVER</span><br><span>       llist_del(&map->bank_list);</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span>     if (new_bank_list)</span><br><span>           llist_add_tail(&map->bank_list, new_bank_list);</span><br><span style="color: hsl(0, 100%, 40%);">-#ifdef REMSIM_SERVER</span><br><span>   else</span><br><span>                 INIT_LLIST_HEAD(&map->bank_list);</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span> }</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void slotmap_state_change(struct slot_mapping *map, enum slot_mapping_state new_state,</span><br><span style="color: hsl(0, 100%, 40%);">-                         struct llist_head *new_bank_list)</span><br><span style="color: hsl(120, 100%, 40%);">+void Slotmap_state_change(struct slot_mapping *map, enum slot_mapping_state new_state,</span><br><span style="color: hsl(120, 100%, 40%);">+                     struct llist_head *new_bank_list, const char *file, int line)</span><br><span> {</span><br><span>         pthread_rwlock_wrlock(&map->maps->rwlock);</span><br><span style="color: hsl(0, 100%, 40%);">-    _slotmap_state_change(map, new_state, new_bank_list);</span><br><span style="color: hsl(120, 100%, 40%);">+ _Slotmap_state_change(map, new_state, new_bank_list, file, line);</span><br><span>    pthread_rwlock_unlock(&map->maps->rwlock);</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/slotmap.h b/src/slotmap.h</span><br><span>index 3eb976f..bc55f29 100644</span><br><span>--- a/src/slotmap.h</span><br><span>+++ b/src/slotmap.h</span><br><span>@@ -87,9 +87,13 @@</span><br><span> struct slotmaps *slotmap_init(void *ctx);</span><br><span> </span><br><span> #ifdef REMSIM_SERVER</span><br><span style="color: hsl(0, 100%, 40%);">-void _slotmap_state_change(struct slot_mapping *map, enum slot_mapping_state new_state,</span><br><span style="color: hsl(0, 100%, 40%);">-                        struct llist_head *new_bank_list);</span><br><span style="color: hsl(120, 100%, 40%);">+void _Slotmap_state_change(struct slot_mapping *map, enum slot_mapping_state new_state,</span><br><span style="color: hsl(120, 100%, 40%);">+                           struct llist_head *new_bank_list, const char *file, int line);</span><br><span> /* thread-safe way to change the state of given slot map */</span><br><span style="color: hsl(0, 100%, 40%);">-void slotmap_state_change(struct slot_mapping *map, enum slot_mapping_state new_state,</span><br><span style="color: hsl(0, 100%, 40%);">-                    struct llist_head *new_bank_list);</span><br><span style="color: hsl(120, 100%, 40%);">+void Slotmap_state_change(struct slot_mapping *map, enum slot_mapping_state new_state,</span><br><span style="color: hsl(120, 100%, 40%);">+                    struct llist_head *new_bank_list, const char *file, int line);</span><br><span style="color: hsl(120, 100%, 40%);">+#define _slotmap_state_change(map, state, list)                               \</span><br><span style="color: hsl(120, 100%, 40%);">+     _Slotmap_state_change(map, state, list, __FILE__, __LINE__)</span><br><span style="color: hsl(120, 100%, 40%);">+#define slotmap_state_change(map, state, list)                             \</span><br><span style="color: hsl(120, 100%, 40%);">+     Slotmap_state_change(map, state, list, __FILE__, __LINE__)</span><br><span> #endif</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13184">change 13184</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/13184"/><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: Idc7b350b464ddc50076f92dae592a0d5ad4d486a </div>
<div style="display:none"> Gerrit-Change-Number: 13184 </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>