<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-abis/+/16823">View Change</a></p><div style="white-space:pre-wrap">Approvals:
tnt: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">e1d: Use LOGPIL/LOGPITS logging macros to give context<br><br>Change-Id: I88ba83783ae1d8368990ec30cdc7ecff88884e41<br>---<br>M src/input/e1d.c<br>1 file changed, 9 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/input/e1d.c b/src/input/e1d.c</span><br><span>index e111d14..2b67141 100644</span><br><span>--- a/src/input/e1d.c</span><br><span>+++ b/src/input/e1d.c</span><br><span>@@ -66,13 +66,13 @@</span><br><span> </span><br><span> ret = read(bfd->fd, msg->data, TS_SIGN_ALLOC_SIZE - 16);</span><br><span> if (ret < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno));</span><br><span> return ret;</span><br><span> }</span><br><span> </span><br><span> msgb_put(msg, ret);</span><br><span> if (ret <= 1) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno));</span><br><span> return ret;</span><br><span> }</span><br><span> </span><br><span>@@ -130,7 +130,7 @@</span><br><span> ret = write(bfd->fd, msg->data, msg->len);</span><br><span> msgb_free(msg);</span><br><span> if (ret < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLMI, LOGL_NOTICE, "%s write failed %d\n", __func__, ret);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPITS(e1i_ts, DLMI, LOGL_NOTICE, "%s write failed %d\n", __func__, ret);</span><br><span> }</span><br><span> </span><br><span> static int</span><br><span>@@ -150,8 +150,7 @@</span><br><span> ret = handle_ts_sign_write(bfd);</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLINP, LOGL_NOTICE,</span><br><span style="color: hsl(0, 100%, 40%);">- "unknown/unsupported E1 TS type %u\n", e1i_ts->type);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPITS(e1i_ts, DLINP, LOGL_NOTICE, "unknown/unsupported E1 TS type %u\n", e1i_ts->type);</span><br><span> break;</span><br><span> }</span><br><span> </span><br><span>@@ -164,7 +163,7 @@</span><br><span> {</span><br><span> /* We never include the DAHDI B-Channel FD into the writeset */</span><br><span> if (e1i_ts->type == E1INP_TS_TYPE_TRAU) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLINP, LOGL_DEBUG, "Trying to write TRAU ts\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPITS(e1i_ts, DLINP, LOGL_DEBUG, "Trying to write TRAU ts\n");</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -188,7 +187,7 @@</span><br><span> return -EINVAL;</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLINP, LOGL_NOTICE, "Line update %d %d=E1D(%d:%d) %d\n", line->num, line->port_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPIL(line, DLINP, LOGL_NOTICE, "Line update %d %d=E1D(%d:%d) %d\n", line->num, line->port_nr,</span><br><span> e1d_intf, e1d_line, line->num_ts);</span><br><span> </span><br><span> for (ts=1; ts<line->num_ts; ts++)</span><br><span>@@ -223,8 +222,7 @@</span><br><span> E1DP_TSMODE_HDLCFCS);</span><br><span> }</span><br><span> if (bfd->fd < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLINP, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "Could not open timeslot %d\n", ts);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "Could not open timeslot %d\n", ts);</span><br><span> return -EIO;</span><br><span> }</span><br><span> bfd->when = BSC_FD_READ;</span><br><span>@@ -244,9 +242,7 @@</span><br><span> </span><br><span> ret = osmo_fd_register(bfd);</span><br><span> if (ret < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLINP, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "could not register FD: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- strerror(ret));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "could not register FD: %s\n", strerror(ret));</span><br><span> return ret;</span><br><span> }</span><br><span> }</span><br><span>@@ -266,7 +262,7 @@</span><br><span> /* Connect to daemon */</span><br><span> g_e1d = osmo_e1dp_client_create(NULL, "/tmp/osmo-e1d.ctl");</span><br><span> if (!g_e1d) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLINP, LOGL_ERROR, "Unable to connect to osmo-e1d daemon\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLINP, LOGL_ERROR, "Unable to connect to osmo-e1d daemon\n");</span><br><span> return -EPIPE;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-abis/+/16823">change 16823</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/libosmo-abis/+/16823"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmo-abis </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I88ba83783ae1d8368990ec30cdc7ecff88884e41 </div>
<div style="display:none"> Gerrit-Change-Number: 16823 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Assignee: tnt <tnt@246tNt.com> </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-Reviewer: tnt <tnt@246tNt.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>