<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/16145">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">logging: remame category DSUM to DBTS, update description<br><br>It is still unclear to me what is the meaning of logging category<br>'SUM' (summary?). It was introduced back in 2011 without a proper<br>description or any documentation.<br><br>Nowdays most osmo-* projects tend to have a special logging category<br>dedicated for application specific needs (e.g. DMSC, DBSC). Let's<br>also introduce a similar one for OsmoBTS - DBTS.<br><br>In order to keep backwards compatibility with older configuration<br>files, let's use logging_vty_add_deprecated_subsys().<br><br>Change-Id: Ia9db783bc92b23ba87b4fdf1e4ed07d59ea6bbce<br>Depends-On: Ia934581410cd41594791d4e14ee74c16abe1009a<br>---<br>M doc/manuals/vty/bts_vty_reference.xml<br>M include/osmo-bts/logging.h<br>M src/common/bts.c<br>M src/common/logging.c<br>M src/common/vty.c<br>M src/osmo-bts-virtual/main.c<br>6 files changed, 19 insertions(+), 16 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/45/16145/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/manuals/vty/bts_vty_reference.xml b/doc/manuals/vty/bts_vty_reference.xml</span><br><span>index d5621c8..ca5b45e 100644</span><br><span>--- a/doc/manuals/vty/bts_vty_reference.xml</span><br><span>+++ b/doc/manuals/vty/bts_vty_reference.xml</span><br><span>@@ -254,7 +254,7 @@</span><br><span> <param name='MASK' doc='List of logging categories to log, e.g. 'abc:mno:xyz'. Available log categories depend on the specific application, refer to the 'logging level' command. Optionally add individual log levels like 'abc,1:mno,3:xyz,5', where the level numbers are LOGL_DEBUG=1 LOGL_INFO=3 LOGL_NOTICE=5 LOGL_ERROR=7 LOGL_FATAL=8' /></span><br><span> </params></span><br><span> </command></span><br><span style="color: hsl(0, 100%, 40%);">- <command id='logging level (rsl|oml|rll|rr|meas|pag|l1c|l1p|dsp|pcu|ho|trx|loop|abis|rtp|sum|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf|lrspro) (debug|info|notice|error|fatal)'></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='logging level (rsl|oml|rll|rr|meas|pag|l1c|l1p|dsp|pcu|ho|trx|loop|abis|rtp|bts|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf|lrspro) (debug|info|notice|error|fatal)'></span><br><span> <params></span><br><span> <param name='logging' doc='Configure logging' /></span><br><span> <param name='level' doc='Set the log level for a specified category' /></span><br><span>@@ -273,7 +273,7 @@</span><br><span> <param name='loop' doc='Control loops' /></span><br><span> <param name='abis' doc='A-bis Intput Subsystem' /></span><br><span> <param name='rtp' doc='Realtime Transfer Protocol' /></span><br><span style="color: hsl(0, 100%, 40%);">- <param name='sum' doc='DSUM' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='bts' doc='Base Transceiver Station' /></span><br><span> <param name='lglobal' doc='Library-internal global log family' /></span><br><span> <param name='llapd' doc='LAPD in libosmogsm' /></span><br><span> <param name='linp' doc='A-bis Intput Subsystem' /></span><br><span>@@ -665,7 +665,7 @@</span><br><span> <param name='loop' doc='Control loops' /></span><br><span> <param name='abis' doc='A-bis Intput Subsystem' /></span><br><span> <param name='rtp' doc='Realtime Transfer Protocol' /></span><br><span style="color: hsl(0, 100%, 40%);">- <param name='sum' doc='DSUM' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='bts' doc='Base Transceiver Station' /></span><br><span> <param name='lglobal' doc='Library-internal global log family' /></span><br><span> <param name='llapd' doc='LAPD in libosmogsm' /></span><br><span> <param name='linp' doc='A-bis Intput Subsystem' /></span><br><span>@@ -1199,7 +1199,7 @@</span><br><span> <param name='loop' doc='Control loops' /></span><br><span> <param name='abis' doc='A-bis Intput Subsystem' /></span><br><span> <param name='rtp' doc='Realtime Transfer Protocol' /></span><br><span style="color: hsl(0, 100%, 40%);">- <param name='sum' doc='DSUM' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='bts' doc='Base Transceiver Station' /></span><br><span> <param name='lglobal' doc='Library-internal global log family' /></span><br><span> <param name='llapd' doc='LAPD in libosmogsm' /></span><br><span> <param name='linp' doc='A-bis Intput Subsystem' /></span><br><span>diff --git a/include/osmo-bts/logging.h b/include/osmo-bts/logging.h</span><br><span>index 852c383..e2d6e30 100644</span><br><span>--- a/include/osmo-bts/logging.h</span><br><span>+++ b/include/osmo-bts/logging.h</span><br><span>@@ -20,7 +20,7 @@</span><br><span> DLOOP,</span><br><span> DABIS,</span><br><span> DRTP,</span><br><span style="color: hsl(0, 100%, 40%);">- DSUM,</span><br><span style="color: hsl(120, 100%, 40%);">+ DBTS,</span><br><span> };</span><br><span> </span><br><span> extern const struct log_info bts_log_info;</span><br><span>diff --git a/src/common/bts.c b/src/common/bts.c</span><br><span>index da41176..8d966c9 100644</span><br><span>--- a/src/common/bts.c</span><br><span>+++ b/src/common/bts.c</span><br><span>@@ -306,7 +306,7 @@</span><br><span> {</span><br><span> int i, j;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DSUM, LOGL_INFO, "Main link established, sending Status'.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DBTS, LOGL_INFO, "Main link established, sending Status'.\n");</span><br><span> </span><br><span> /* BTS and SITE MGR are EANBLED, BTS is DEPENDENCY */</span><br><span> oml_tx_state_changed(&bts->site_mgr.mo);</span><br><span>@@ -342,7 +342,7 @@</span><br><span> uint8_t radio_state = link ? NM_OPSTATE_ENABLED : NM_OPSTATE_DISABLED;</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DSUM, LOGL_INFO, "RSL link (TRX %02x) state changed to %s, sending Status'.\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DBTS, LOGL_INFO, "RSL link (TRX %02x) state changed to %s, sending Status'.\n",</span><br><span> trx->nr, link ? "up" : "down");</span><br><span> </span><br><span> oml_mo_state_chg(&trx->mo, radio_state, NM_AVSTATE_OK);</span><br><span>@@ -366,7 +366,7 @@</span><br><span> {</span><br><span> int tn;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DSUM, LOGL_INFO, "TRX(%d): Setting available = %d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DBTS, LOGL_INFO, "TRX(%d): Setting available = %d\n",</span><br><span> trx->nr, avail);</span><br><span> if (avail) {</span><br><span> int op_state = trx->rsl_link ? NM_OPSTATE_ENABLED : NM_OPSTATE_DISABLED;</span><br><span>@@ -632,7 +632,7 @@</span><br><span> struct gsm48_imm_ass_rej *imm_ass_cmd = msgb_l3(msg);</span><br><span> </span><br><span> if (bts->agch_queue.length > hard_limit) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DSUM, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DBTS, LOGL_ERROR,</span><br><span> "AGCH: too many messages in queue, "</span><br><span> "refusing message type %s, length = %d/%d\n",</span><br><span> gsm48_rr_msg_name(((struct gsm48_imm_ass *)msgb_l3(msg))->msg_type),</span><br><span>diff --git a/src/common/logging.c b/src/common/logging.c</span><br><span>index 8340736..e5d26b2 100644</span><br><span>--- a/src/common/logging.c</span><br><span>+++ b/src/common/logging.c</span><br><span>@@ -136,9 +136,9 @@</span><br><span> .enabled = 1, .loglevel = LOGL_DEBUG,</span><br><span> },</span><br><span> #endif</span><br><span style="color: hsl(0, 100%, 40%);">- [DSUM] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "DSUM",</span><br><span style="color: hsl(0, 100%, 40%);">- .description = "DSUM",</span><br><span style="color: hsl(120, 100%, 40%);">+ [DBTS] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DBTS",</span><br><span style="color: hsl(120, 100%, 40%);">+ .description = "Base Transceiver Station",</span><br><span> .loglevel = LOGL_NOTICE,</span><br><span> .enabled = 1,</span><br><span> },</span><br><span>diff --git a/src/common/vty.c b/src/common/vty.c</span><br><span>index 2558ba8..b81827d 100644</span><br><span>--- a/src/common/vty.c</span><br><span>+++ b/src/common/vty.c</span><br><span>@@ -1741,5 +1741,8 @@</span><br><span> </span><br><span> install_node(&phy_inst_node, config_write_dummy);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Ensure backwards compatibility with older config files */</span><br><span style="color: hsl(120, 100%, 40%);">+ logging_vty_add_deprecated_subsys(bts, "sum");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return 0;</span><br><span> }</span><br><span>diff --git a/src/osmo-bts-virtual/main.c b/src/osmo-bts-virtual/main.c</span><br><span>index c329f3a..4dd944a 100644</span><br><span>--- a/src/osmo-bts-virtual/main.c</span><br><span>+++ b/src/osmo-bts-virtual/main.c</span><br><span>@@ -82,7 +82,7 @@</span><br><span> </span><br><span> void bts_model_print_help()</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DSUM, LOGL_NOTICE, "Unimplemented %s\n", __func__);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DBTS, LOGL_NOTICE, "Unimplemented %s\n", __func__);</span><br><span> }</span><br><span> </span><br><span> int bts_model_handle_options(int argc, char **argv)</span><br><span>@@ -127,18 +127,18 @@</span><br><span> </span><br><span> void bts_model_phy_instance_set_defaults(struct phy_instance *pinst)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DSUM, LOGL_NOTICE, "Unimplemented %s\n", __func__);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DBTS, LOGL_NOTICE, "Unimplemented %s\n", __func__);</span><br><span> }</span><br><span> </span><br><span> int bts_model_ts_disconnect(struct gsm_bts_trx_ts *ts)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DSUM, LOGL_NOTICE, "Unimplemented %s\n", __func__);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DBTS, LOGL_NOTICE, "Unimplemented %s\n", __func__);</span><br><span> return -ENOTSUP;</span><br><span> }</span><br><span> </span><br><span> void bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DSUM, LOGL_NOTICE, "Unimplemented %s\n", __func__);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DBTS, LOGL_NOTICE, "Unimplemented %s\n", __func__);</span><br><span> }</span><br><span> </span><br><span> int main(int argc, char **argv)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/16145">change 16145</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/+/16145"/><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: Ia9db783bc92b23ba87b4fdf1e4ed07d59ea6bbce </div>
<div style="display:none"> Gerrit-Change-Number: 16145 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>