<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10537">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;">use __FILE__, not __BASE_FILE__<br><br>The intention was to use the file's basename, but __BASE_FILE__ means "the root<br>file that is being parsed and contains #include statements".<br><br>If we had a function using __BASE_FILE__ and that was defined in an #included<br>file, __BASE_FILE__ would indicate the first file where the #include is, and<br>not the file where the function is defined. __BASE_FILE__ works for us because<br>we don't ever include function definitions that log something, so __BASE_FILE__<br>always coincides with __FILE__ for our logging; but still __BASE_FILE__ is<br>semantically the wrong constant.<br><br>Related: OS#2740<br>Change-Id: Ibc1d3746f1876ac42d6b1faf0e5f83bd2283cdcc<br>---<br>M include/osmocom/core/fsm.h<br>M include/osmocom/core/logging.h<br>M include/osmocom/core/utils.h<br>M include/osmocom/gsm/mncc.h<br>M src/gb/gprs_ns.c<br>5 files changed, 15 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/core/fsm.h b/include/osmocom/core/fsm.h</span><br><span>index 9e1062f..54bbad5 100644</span><br><span>--- a/include/osmocom/core/fsm.h</span><br><span>+++ b/include/osmocom/core/fsm.h</span><br><span>@@ -178,7 +178,7 @@</span><br><span> */</span><br><span> #define osmo_fsm_inst_state_chg(fi, new_state, timeout_secs, T) \</span><br><span> _osmo_fsm_inst_state_chg(fi, new_state, timeout_secs, T, \</span><br><span style="color: hsl(0, 100%, 40%);">- __BASE_FILE__, __LINE__)</span><br><span style="color: hsl(120, 100%, 40%);">+ __FILE__, __LINE__)</span><br><span> int _osmo_fsm_inst_state_chg(struct osmo_fsm_inst *fi, uint32_t new_state,</span><br><span> unsigned long timeout_secs, int T,</span><br><span> const char *file, int line);</span><br><span>@@ -194,7 +194,7 @@</span><br><span> */</span><br><span> #define osmo_fsm_inst_state_chg_keep_timer(fi, new_state) \</span><br><span> _osmo_fsm_inst_state_chg_keep_timer(fi, new_state, \</span><br><span style="color: hsl(0, 100%, 40%);">- __BASE_FILE__, __LINE__)</span><br><span style="color: hsl(120, 100%, 40%);">+ __FILE__, __LINE__)</span><br><span> int _osmo_fsm_inst_state_chg_keep_timer(struct osmo_fsm_inst *fi, uint32_t new_state,</span><br><span> const char *file, int line);</span><br><span> </span><br><span>@@ -205,7 +205,7 @@</span><br><span> * purposes. See there for documentation.</span><br><span> */</span><br><span> #define osmo_fsm_inst_dispatch(fi, event, data) \</span><br><span style="color: hsl(0, 100%, 40%);">- _osmo_fsm_inst_dispatch(fi, event, data, __BASE_FILE__, __LINE__)</span><br><span style="color: hsl(120, 100%, 40%);">+ _osmo_fsm_inst_dispatch(fi, event, data, __FILE__, __LINE__)</span><br><span> int _osmo_fsm_inst_dispatch(struct osmo_fsm_inst *fi, uint32_t event, void *data,</span><br><span> const char *file, int line);</span><br><span> </span><br><span>@@ -216,7 +216,7 @@</span><br><span> * See there for documentation.</span><br><span> */</span><br><span> #define osmo_fsm_inst_term(fi, cause, data) \</span><br><span style="color: hsl(0, 100%, 40%);">- _osmo_fsm_inst_term(fi, cause, data, __BASE_FILE__, __LINE__)</span><br><span style="color: hsl(120, 100%, 40%);">+ _osmo_fsm_inst_term(fi, cause, data, __FILE__, __LINE__)</span><br><span> void _osmo_fsm_inst_term(struct osmo_fsm_inst *fi,</span><br><span> enum osmo_fsm_term_cause cause, void *data,</span><br><span> const char *file, int line);</span><br><span>@@ -228,7 +228,7 @@</span><br><span> * purposes. See there for documentation.</span><br><span> */</span><br><span> #define osmo_fsm_inst_term_children(fi, cause, data) \</span><br><span style="color: hsl(0, 100%, 40%);">- _osmo_fsm_inst_term_children(fi, cause, data, __BASE_FILE__, __LINE__)</span><br><span style="color: hsl(120, 100%, 40%);">+ _osmo_fsm_inst_term_children(fi, cause, data, __FILE__, __LINE__)</span><br><span> void _osmo_fsm_inst_term_children(struct osmo_fsm_inst *fi,</span><br><span> enum osmo_fsm_term_cause cause,</span><br><span> void *data,</span><br><span>diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h</span><br><span>index e68f618..3cae63d 100644</span><br><span>--- a/include/osmocom/core/logging.h</span><br><span>+++ b/include/osmocom/core/logging.h</span><br><span>@@ -55,17 +55,17 @@</span><br><span> #define LOGPC(ss, level, fmt, args...) \</span><br><span> do { \</span><br><span> if (log_check_level(ss, level)) \</span><br><span style="color: hsl(0, 100%, 40%);">- logp2(ss, level, __BASE_FILE__, __LINE__, 1, fmt, ##args); \</span><br><span style="color: hsl(120, 100%, 40%);">+ logp2(ss, level, __FILE__, __LINE__, 1, fmt, ##args); \</span><br><span> } while(0)</span><br><span> </span><br><span> /*! Log through the Osmocom logging framework with explicit source.</span><br><span style="color: hsl(0, 100%, 40%);">- * If caller_file is passed as NULL, __BASE_FILE__ and __LINE__ are used</span><br><span style="color: hsl(120, 100%, 40%);">+ * If caller_file is passed as NULL, __FILE__ and __LINE__ are used</span><br><span> * instead of caller_file and caller_line (so that this macro here defines</span><br><span> * both cases in the same place, and to catch cases where callers fail to pass</span><br><span> * a non-null filename string).</span><br><span> * \param[in] ss logging subsystem (e.g. \ref DLGLOBAL)</span><br><span> * \param[in] level logging level (e.g. \ref LOGL_NOTICE)</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] caller_file caller's source file string (e.g. __BASE_FILE__)</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] caller_file caller's source file string (e.g. __FILE__)</span><br><span> * \param[in] caller_line caller's source line nr (e.g. __LINE__)</span><br><span> * \param[in] fmt format string</span><br><span> * \param[in] args variable argument list</span><br><span>@@ -74,13 +74,13 @@</span><br><span> LOGPSRCC(ss, level, caller_file, caller_line, 0, fmt, ##args)</span><br><span> </span><br><span> /*! Log through the Osmocom logging framework with explicit source.</span><br><span style="color: hsl(0, 100%, 40%);">- * If caller_file is passed as NULL, __BASE_FILE__ and __LINE__ are used</span><br><span style="color: hsl(120, 100%, 40%);">+ * If caller_file is passed as NULL, __FILE__ and __LINE__ are used</span><br><span> * instead of caller_file and caller_line (so that this macro here defines</span><br><span> * both cases in the same place, and to catch cases where callers fail to pass</span><br><span> * a non-null filename string).</span><br><span> * \param[in] ss logging subsystem (e.g. \ref DLGLOBAL)</span><br><span> * \param[in] level logging level (e.g. \ref LOGL_NOTICE)</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] caller_file caller's source file string (e.g. __BASE_FILE__)</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] caller_file caller's source file string (e.g. __FILE__)</span><br><span> * \param[in] caller_line caller's source line nr (e.g. __LINE__)</span><br><span> * \param[in] cont continuation (1) or new line (0)</span><br><span> * \param[in] fmt format string</span><br><span>@@ -92,7 +92,7 @@</span><br><span> if (caller_file) \</span><br><span> logp2(ss, level, caller_file, caller_line, cont, fmt, ##args); \</span><br><span> else \</span><br><span style="color: hsl(0, 100%, 40%);">- logp2(ss, level, __BASE_FILE__, __LINE__, cont, fmt, ##args); \</span><br><span style="color: hsl(120, 100%, 40%);">+ logp2(ss, level, __FILE__, __LINE__, cont, fmt, ##args); \</span><br><span> }\</span><br><span> } while(0)</span><br><span> </span><br><span>diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h</span><br><span>index dd4461c..e2d5134 100644</span><br><span>--- a/include/osmocom/core/utils.h</span><br><span>+++ b/include/osmocom/core/utils.h</span><br><span>@@ -78,7 +78,7 @@</span><br><span> */</span><br><span> #define OSMO_ASSERT(exp) \</span><br><span> if (!(exp)) { \</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_panic("Assert failed %s %s:%d\n", #exp, __BASE_FILE__, __LINE__); \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_panic("Assert failed %s %s:%d\n", #exp, __FILE__, __LINE__); \</span><br><span> }</span><br><span> </span><br><span> /*! duplicate a string using talloc and release its prior content (if any)</span><br><span>diff --git a/include/osmocom/gsm/mncc.h b/include/osmocom/gsm/mncc.h</span><br><span>index 6b94d46..7e7d12c 100644</span><br><span>--- a/include/osmocom/gsm/mncc.h</span><br><span>+++ b/include/osmocom/gsm/mncc.h</span><br><span>@@ -90,7 +90,7 @@</span><br><span> const uint8_t *msg, unsigned int len);</span><br><span> </span><br><span> #define osmo_mncc_log(ss, level, prefix, msg, len) \</span><br><span style="color: hsl(0, 100%, 40%);">- _osmo_mncc_log(ss, level, __BASE_FILE__, __LINE__, prefix, msg, len);</span><br><span style="color: hsl(120, 100%, 40%);">+ _osmo_mncc_log(ss, level, __FILE__, __LINE__, prefix, msg, len);</span><br><span> </span><br><span> extern const struct value_string osmo_mncc_names[];</span><br><span> static inline const char *osmo_mncc_name(uint32_t msg_type) {</span><br><span>diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c</span><br><span>index 75c3141..9b7cc05 100644</span><br><span>--- a/src/gb/gprs_ns.c</span><br><span>+++ b/src/gb/gprs_ns.c</span><br><span>@@ -87,8 +87,8 @@</span><br><span> </span><br><span> #include "common_vty.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define ns_set_state(ns_, st_) ns_set_state_with_log(ns_, st_, false, __BASE_FILE__, __LINE__)</span><br><span style="color: hsl(0, 100%, 40%);">-#define ns_set_remote_state(ns_, st_) ns_set_state_with_log(ns_, st_, true, __BASE_FILE__, __LINE__)</span><br><span style="color: hsl(120, 100%, 40%);">+#define ns_set_state(ns_, st_) ns_set_state_with_log(ns_, st_, false, __FILE__, __LINE__)</span><br><span style="color: hsl(120, 100%, 40%);">+#define ns_set_remote_state(ns_, st_) ns_set_state_with_log(ns_, st_, true, __FILE__, __LINE__)</span><br><span> #define ns_mark_blocked(ns_) ns_set_state(ns_, (ns_)->state | NSE_S_BLOCKED)</span><br><span> #define ns_mark_unblocked(ns_) ns_set_state(ns_, (ns_)->state & (~NSE_S_BLOCKED));</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10537">change 10537</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/10537"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ibc1d3746f1876ac42d6b1faf0e5f83bd2283cdcc </div>
<div style="display:none"> Gerrit-Change-Number: 10537 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>