<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-remsim/+/17363">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">user_simtrace2: Stop using printf, use libosmocore logging<br><br>This way we have consistent logging from all parts of the code via<br>the common libosmocore logging infrastructure.<br><br>Change-Id: I9ace31d781dd3e50f9a5d9239bafa87a01abb0d6<br>---<br>M src/client/user_simtrace2.c<br>M src/debug.c<br>M src/debug.h<br>3 files changed, 24 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/63/17363/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/client/user_simtrace2.c b/src/client/user_simtrace2.c</span><br><span>index 24a8d09..5d5bfc1 100644</span><br><span>--- a/src/client/user_simtrace2.c</span><br><span>+++ b/src/client/user_simtrace2.c</span><br><span>@@ -37,6 +37,8 @@</span><br><span> #include "client.h"</span><br><span> #include "debug.h"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define LOGCI(ci, lvl, fmt, args ...) \</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DST2, lvl, fmt, ## args)</span><br><span> </span><br><span> /***********************************************************************</span><br><span> * Incoming Messages from cardem firmware</span><br><span>@@ -48,9 +50,8 @@</span><br><span> struct cardemu_usb_msg_status *status;</span><br><span> status = (struct cardemu_usb_msg_status *) buf;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf("SIMtrace => STATUS: flags=0x%x, fi=%u, di=%u, wi=%u wtime=%u\n",</span><br><span style="color: hsl(0, 100%, 40%);">- status->flags, status->fi, status->di, status->wi,</span><br><span style="color: hsl(0, 100%, 40%);">- status->waiting_time);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGCI(ci, LOGL_INFO, "SIMtrace => STATUS: flags=0x%x, fi=%u, di=%u, wi=%u wtime=%u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ status->flags, status->fi, status->di, status->wi, status->waiting_time);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -65,7 +66,7 @@</span><br><span> .len = sizeof(pts->req),</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf("SIMtrace => PTS req: %s\n", osmo_hexdump(pts->req, sizeof(pts->req)));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGCI(ci, LOGL_INFO, "SIMtrace => PTS req: %s\n", osmo_hexdump(pts->req, sizeof(pts->req)));</span><br><span> </span><br><span> osmo_fsm_inst_dispatch(bc->main_fi, MF_E_MDM_PTS_IND, &fpts);</span><br><span> </span><br><span>@@ -78,9 +79,8 @@</span><br><span> struct cardemu_usb_msg_error *err;</span><br><span> err = (struct cardemu_usb_msg_error *) buf;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf("SIMtrace => ERROR: %u/%u/%u: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- err->severity, err->subsystem, err->code,</span><br><span style="color: hsl(0, 100%, 40%);">- err->msg_len ? (char *)err->msg : "");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGCI(ci, LOGL_ERROR, "SIMtrace => ERROR: %u/%u/%u: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ err->severity, err->subsystem, err->code, err->msg_len ? (char *)err->msg : "");</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -95,7 +95,7 @@</span><br><span> struct frontend_tpdu ftpdu;</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf("SIMtrace => DATA: flags=%x, %s: ", data->flags,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGCI(ci, LOGL_DEBUG, "SIMtrace => DATA: flags=%x, %s: ", data->flags,</span><br><span> osmo_hexdump(data->data, data->data_len));</span><br><span> </span><br><span> /* parse the APDU data in the USB message */</span><br><span>@@ -131,7 +131,7 @@</span><br><span> struct simtrace_msg_hdr *sh = (struct simtrace_msg_hdr *)buf;</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf("SIMtrace -> %s\n", osmo_hexdump(buf, len));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGCI(ci, LOGL_DEBUG, "SIMtrace -> %s\n", osmo_hexdump(buf, len));</span><br><span> </span><br><span> buf += sizeof(*sh);</span><br><span> </span><br><span>@@ -149,7 +149,7 @@</span><br><span> /* firmware confirms configuration change; ignore */</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("unknown simtrace msg type 0x%02x\n", sh->msg_type);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGCI(ci, LOGL_ERROR, "unknown simtrace msg type 0x%02x\n", sh->msg_type);</span><br><span> rc = -1;</span><br><span> break;</span><br><span> }</span><br><span>@@ -177,7 +177,7 @@</span><br><span> .waiting_time = status->waiting_time,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf("SIMtrace IRQ STATUS: flags=0x%x, fi=%u, di=%u, wi=%u wtime=%u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGCI(ci, LOGL_INFO, "SIMtrace IRQ STATUS: flags=0x%x, fi=%u, di=%u, wi=%u wtime=%u\n",</span><br><span> status->flags, status->fi, status->di, status->wi,</span><br><span> status->waiting_time);</span><br><span> </span><br><span>@@ -190,7 +190,7 @@</span><br><span> struct simtrace_msg_hdr *sh = (struct simtrace_msg_hdr *)buf;</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf("SIMtrace IRQ %s\n", osmo_hexdump(buf, len));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGCI(ci, LOGL_INFO, "SIMtrace IRQ %s\n", osmo_hexdump(buf, len));</span><br><span> </span><br><span> buf += sizeof(*sh);</span><br><span> </span><br><span>@@ -199,7 +199,7 @@</span><br><span> rc = process_irq_status(ci, buf, len);</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("unknown simtrace msg type 0x%02x\n", sh->msg_type);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGCI(ci, LOGL_ERROR, "unknown simtrace msg type 0x%02x\n", sh->msg_type);</span><br><span> rc = -1;</span><br><span> break;</span><br><span> }</span><br><span>@@ -218,11 +218,11 @@</span><br><span> process_usb_msg(ci, xfer->buffer, xfer->actual_length);</span><br><span> break;</span><br><span> case LIBUSB_TRANSFER_NO_DEVICE:</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "USB device disappeared\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGCI(ci, LOGL_FATAL, "USB device disappeared\n");</span><br><span> exit(1);</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "USB IN transfer failed, status=%u\n", xfer->status);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGCI(ci, LOGL_FATAL, "USB IN transfer failed, status=%u\n", xfer->status);</span><br><span> exit(1);</span><br><span> break;</span><br><span> }</span><br><span>@@ -269,11 +269,11 @@</span><br><span> process_usb_msg_irq(ci, xfer->buffer, xfer->actual_length);</span><br><span> break;</span><br><span> case LIBUSB_TRANSFER_NO_DEVICE:</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "USB device disappeared\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGCI(ci, LOGL_FATAL, "USB device disappeared\n");</span><br><span> exit(1);</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "USB IRQ transfer failed, status=%u\n", xfer->status);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGCI(ci, LOGL_FATAL, "USB IN transfer failed, status=%u\n", xfer->status);</span><br><span> exit(1);</span><br><span> break;</span><br><span> }</span><br><span>@@ -341,7 +341,7 @@</span><br><span> ac.sw[0] = data[len-2];</span><br><span> ac.sw[1] = data[len=1];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf("SIMtrace <= SW=0x%02x%02x, len_rx=%zu\n", ac.sw[0], ac.sw[1], len-2);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGCI(ci, LOGL_DEBUG, "SIMtrace <= SW=0x%02x%02x, len_rx=%zu\n", ac.sw[0], ac.sw[1], len-2);</span><br><span> if (len > 2) { // send PB and data to modem</span><br><span> osmo_st2_cardem_request_pb_and_tx(ci, ac.hdr.ins, data, len-2);</span><br><span> }</span><br><span>diff --git a/src/debug.c b/src/debug.c</span><br><span>index 70c04d2..91c2f71 100644</span><br><span>--- a/src/debug.c</span><br><span>+++ b/src/debug.c</span><br><span>@@ -31,6 +31,11 @@</span><br><span> .loglevel = LOGL_DEBUG,</span><br><span> .enabled = 1,</span><br><span> },</span><br><span style="color: hsl(120, 100%, 40%);">+ [DST2] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DST2",</span><br><span style="color: hsl(120, 100%, 40%);">+ .loglevel = LOGL_INFO,</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/debug.h b/src/debug.h</span><br><span>index e3994b4..2a3e5a3 100644</span><br><span>--- a/src/debug.h</span><br><span>+++ b/src/debug.h</span><br><span>@@ -3,6 +3,7 @@</span><br><span> </span><br><span> enum {</span><br><span> DMAIN,</span><br><span style="color: hsl(120, 100%, 40%);">+ DST2,</span><br><span> };</span><br><span> </span><br><span> extern const struct log_info log_info;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-remsim/+/17363">change 17363</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-remsim/+/17363"/><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-Change-Id: I9ace31d781dd3e50f9a5d9239bafa87a01abb0d6 </div>
<div style="display:none"> Gerrit-Change-Number: 17363 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-CC: Jenkins Builder </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>