<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-e1d/+/19034">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
tnt: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">move from printf() debug output to libosmocore logging<br><br>Change-Id: I6b652554c472c0fa7d180b533ef1ed4b92b49ab9<br>---<br>M src/intf_line.c<br>M src/log.c<br>M src/log.h<br>M src/usb.c<br>4 files changed, 19 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/intf_line.c b/src/intf_line.c</span><br><span>index 22d5f55..bc01559 100644</span><br><span>--- a/src/intf_line.c</span><br><span>+++ b/src/intf_line.c</span><br><span>@@ -107,10 +107,12 @@</span><br><span> );</span><br><span> </span><br><span> if (rv > 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("RX Message: %d %d [ %s]\n", ts->id, rv, osmo_hexdump(ts->rx_buf, rv));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DXFR, LOGL_DEBUG, "RX Message: %d %d [ %s]\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->id, rv, osmo_hexdump(ts->rx_buf, rv));</span><br><span> write(ts->fd, ts->rx_buf, rv);</span><br><span> } else if (rv < 0 && ts->id == 4) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("ERR RX: %d %d %d [ %s]\n",rv,oi,cl, osmo_hexdump(buf, len));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DXFR, LOGL_ERROR, "ERR RX: %d %d %d [ %s]\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ rv,oi,cl, osmo_hexdump(buf, len));</span><br><span> }</span><br><span> </span><br><span> oi += cl;</span><br><span>@@ -131,7 +133,8 @@</span><br><span> if (!ts->tx_len) {</span><br><span> rv = read(ts->fd, ts->tx_buf, sizeof(ts->tx_buf));</span><br><span> if (rv > 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("TX Message: %d %d [ %s]\n", ts->id, rv, osmo_hexdump(ts->tx_buf, rv));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DXFR, LOGL_DEBUG, "TX Message: %d %d [ %s]\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->id, rv, osmo_hexdump(ts->tx_buf, rv));</span><br><span> ts->tx_len = rv; </span><br><span> ts->tx_ofs = 0;</span><br><span> }</span><br><span>@@ -144,10 +147,12 @@</span><br><span> );</span><br><span> </span><br><span> if (rv < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- printf("ERR TX: %d\n", rv);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DXFR, LOGL_ERROR, "ERR TX: %d\n", rv);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (ts->tx_ofs < ts->tx_len)</span><br><span style="color: hsl(0, 100%, 40%);">- printf("TX chunk %d/%d %d [ %s]\n", ts->tx_ofs, ts->tx_len, cl, osmo_hexdump(&buf[ts->tx_ofs], rv));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ts->tx_ofs < ts->tx_len) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DXFR, LOGL_DEBUG, "TX chunk %d/%d %d [ %s]\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->tx_ofs, ts->tx_len, cl, osmo_hexdump(&buf[ts->tx_ofs], rv));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> if (rv > 0)</span><br><span> oo += rv;</span><br><span>@@ -218,7 +223,7 @@</span><br><span> int ftr;</span><br><span> </span><br><span> if (size <= 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("IN ERROR: %d\n", size);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DXFR, LOGL_ERROR, "IN ERROR: %d\n", size);</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/log.c b/src/log.c</span><br><span>index 805d355..c50efe5 100644</span><br><span>--- a/src/log.c</span><br><span>+++ b/src/log.c</span><br><span>@@ -33,6 +33,11 @@</span><br><span> .loglevel = LOGL_DEBUG,</span><br><span> .enabled = 1,</span><br><span> },</span><br><span style="color: hsl(120, 100%, 40%);">+ [DXFR] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DXFR",</span><br><span style="color: hsl(120, 100%, 40%);">+ .loglevel = LOGL_DEBUG,</span><br><span style="color: hsl(120, 100%, 40%);">+ .enabled = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span> };</span><br><span> </span><br><span> const struct log_info log_info = {</span><br><span>diff --git a/src/log.h b/src/log.h</span><br><span>index b3bed47..2a9b210 100644</span><br><span>--- a/src/log.h</span><br><span>+++ b/src/log.h</span><br><span>@@ -28,6 +28,7 @@</span><br><span> </span><br><span> enum {</span><br><span> DE1D,</span><br><span style="color: hsl(120, 100%, 40%);">+ DXFR,</span><br><span> };</span><br><span> </span><br><span> extern const struct log_info log_info;</span><br><span>diff --git a/src/usb.c b/src/usb.c</span><br><span>index ecbb54d..8cf96b4 100644</span><br><span>--- a/src/usb.c</span><br><span>+++ b/src/usb.c</span><br><span>@@ -118,7 +118,7 @@</span><br><span> int fts;</span><br><span> </span><br><span> if (size <= 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("OUT ERROR: %d\n", size);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DXFR, LOGL_ERROR, "OUT ERROR: %d\n", size);</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-e1d/+/19034">change 19034</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-e1d/+/19034"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-e1d </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I6b652554c472c0fa7d180b533ef1ed4b92b49ab9 </div>
<div style="display:none"> Gerrit-Change-Number: 19034 </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: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: tnt <tnt@246tNt.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>