<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/18646">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bts-trx: phy_link: Improve logging fmt in phy_link_state_set()<br><br>Change-Id: I4633dd81d0b4cc104ca9e0803993ba766cb23790<br>---<br>M include/osmo-bts/phy_link.h<br>M src/common/phy_link.c<br>2 files changed, 16 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/phy_link.h b/include/osmo-bts/phy_link.h</span><br><span>index cf877bd..2bed8ea 100644</span><br><span>--- a/include/osmo-bts/phy_link.h</span><br><span>+++ b/include/osmo-bts/phy_link.h</span><br><span>@@ -157,6 +157,7 @@</span><br><span> struct phy_link *phy_link_by_num(int num);</span><br><span> struct phy_link *phy_link_create(void *ctx, int num);</span><br><span> void phy_link_destroy(struct phy_link *plink);</span><br><span style="color: hsl(120, 100%, 40%);">+const char *phy_link_name(struct phy_link *plink);</span><br><span> void phy_link_state_set(struct phy_link *plink, enum phy_link_state state);</span><br><span> enum phy_link_state phy_link_state_get(struct phy_link *plink);</span><br><span> const char *phy_link_state_name(enum phy_link_state state);</span><br><span>@@ -178,4 +179,5 @@</span><br><span> </span><br><span> int bts_model_phy_link_open(struct phy_link *plink);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define LOGPPHL(plink, section, lvl, fmt, args...) LOGP(section, lvl, "%s: " fmt, phy_link_name(plink), ##args)</span><br><span> #define LOGPPHI(pinst, section, lvl, fmt, args...) LOGP(section, lvl, "%s: " fmt, phy_instance_name(pinst), ##args)</span><br><span>diff --git a/src/common/phy_link.c b/src/common/phy_link.c</span><br><span>index 85f9e14..38819eb 100644</span><br><span>--- a/src/common/phy_link.c</span><br><span>+++ b/src/common/phy_link.c</span><br><span>@@ -53,9 +53,9 @@</span><br><span> {</span><br><span>     struct phy_instance *pinst;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DL1C, LOGL_INFO, "PHY link state change %s -> %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">-       get_value_string(phy_link_state_vals, plink->state),</span><br><span style="color: hsl(0, 100%, 40%);">-         get_value_string(phy_link_state_vals, state));</span><br><span style="color: hsl(120, 100%, 40%);">+   LOGPPHL(plink, DL1C, LOGL_INFO, "PHY link state change %s -> %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+              get_value_string(phy_link_state_vals, plink->state),</span><br><span style="color: hsl(120, 100%, 40%);">+               get_value_string(phy_link_state_vals, state));</span><br><span> </span><br><span>   /* notify all TRX associated with this phy */</span><br><span>        llist_for_each_entry(pinst, &plink->instances, list) {</span><br><span>@@ -65,11 +65,11 @@</span><br><span> </span><br><span>              switch (state) {</span><br><span>             case PHY_LINK_CONNECTED:</span><br><span style="color: hsl(0, 100%, 40%);">-                        LOGP(DL1C, LOGL_INFO, "trx_set_avail(1)\n");</span><br><span style="color: hsl(120, 100%, 40%);">+                        LOGPPHI(pinst, DL1C, LOGL_INFO, "trx_set_avail(1)\n");</span><br><span>                     trx_set_available(trx, 1);</span><br><span>                   break;</span><br><span>               case PHY_LINK_SHUTDOWN:</span><br><span style="color: hsl(0, 100%, 40%);">-                 LOGP(DL1C, LOGL_INFO, "trx_set_avail(0)\n");</span><br><span style="color: hsl(120, 100%, 40%);">+                        LOGPPHI(pinst, DL1C, LOGL_INFO, "trx_set_avail(0)\n");</span><br><span>                     trx_set_available(trx, 0);</span><br><span>                   break;</span><br><span>               case PHY_LINK_CONNECTING:</span><br><span>@@ -148,6 +148,13 @@</span><br><span>     talloc_free(plink);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static char name_buf[32];</span><br><span style="color: hsl(120, 100%, 40%);">+const char *phy_link_name(struct phy_link *plink)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(name_buf, sizeof(name_buf), "phy%u", plink->num);</span><br><span style="color: hsl(120, 100%, 40%);">+       return name_buf;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int phy_links_open(void)</span><br><span> {</span><br><span>       struct phy_link *plink;</span><br><span>@@ -165,9 +172,7 @@</span><br><span> </span><br><span> const char *phy_instance_name(struct phy_instance *pinst)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-     static char buf[32];</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-    snprintf(buf, sizeof(buf), "phy%u.%u", pinst->phy_link->num,</span><br><span style="color: hsl(120, 100%, 40%);">+  snprintf(name_buf, sizeof(name_buf), "phy%u.%u", pinst->phy_link->num,</span><br><span>                pinst->num);</span><br><span style="color: hsl(0, 100%, 40%);">-        return buf;</span><br><span style="color: hsl(120, 100%, 40%);">+   return name_buf;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/18646">change 18646</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-bts/+/18646"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I4633dd81d0b4cc104ca9e0803993ba766cb23790 </div>
<div style="display:none"> Gerrit-Change-Number: 18646 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </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>