This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
fixeria gerrit-no-reply at lists.osmocom.orgfixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/16145 ) Change subject: logging: remame category DSUM to DBTS, update description ...................................................................... logging: remame category DSUM to DBTS, update description It is still unclear to me what is the meaning of logging category 'SUM' (summary?). It was introduced back in 2011 without a proper description or any documentation. Nowdays most osmo-* projects tend to have a special logging category dedicated for application specific needs (e.g. DMSC, DBSC). Let's also introduce a similar one for OsmoBTS - DBTS. In order to keep backwards compatibility with older configuration files, let's use logging_vty_add_deprecated_subsys(). Change-Id: Ia9db783bc92b23ba87b4fdf1e4ed07d59ea6bbce Depends-On: Ia934581410cd41594791d4e14ee74c16abe1009a --- M doc/manuals/vty/bts_vty_reference.xml M include/osmo-bts/logging.h M src/common/bts.c M src/common/logging.c M src/common/vty.c M src/osmo-bts-virtual/main.c 6 files changed, 19 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/45/16145/1 diff --git a/doc/manuals/vty/bts_vty_reference.xml b/doc/manuals/vty/bts_vty_reference.xml index d5621c8..ca5b45e 100644 --- a/doc/manuals/vty/bts_vty_reference.xml +++ b/doc/manuals/vty/bts_vty_reference.xml @@ -254,7 +254,7 @@ <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' /> </params> </command> - <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)'> + <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)'> <params> <param name='logging' doc='Configure logging' /> <param name='level' doc='Set the log level for a specified category' /> @@ -273,7 +273,7 @@ <param name='loop' doc='Control loops' /> <param name='abis' doc='A-bis Intput Subsystem' /> <param name='rtp' doc='Realtime Transfer Protocol' /> - <param name='sum' doc='DSUM' /> + <param name='bts' doc='Base Transceiver Station' /> <param name='lglobal' doc='Library-internal global log family' /> <param name='llapd' doc='LAPD in libosmogsm' /> <param name='linp' doc='A-bis Intput Subsystem' /> @@ -665,7 +665,7 @@ <param name='loop' doc='Control loops' /> <param name='abis' doc='A-bis Intput Subsystem' /> <param name='rtp' doc='Realtime Transfer Protocol' /> - <param name='sum' doc='DSUM' /> + <param name='bts' doc='Base Transceiver Station' /> <param name='lglobal' doc='Library-internal global log family' /> <param name='llapd' doc='LAPD in libosmogsm' /> <param name='linp' doc='A-bis Intput Subsystem' /> @@ -1199,7 +1199,7 @@ <param name='loop' doc='Control loops' /> <param name='abis' doc='A-bis Intput Subsystem' /> <param name='rtp' doc='Realtime Transfer Protocol' /> - <param name='sum' doc='DSUM' /> + <param name='bts' doc='Base Transceiver Station' /> <param name='lglobal' doc='Library-internal global log family' /> <param name='llapd' doc='LAPD in libosmogsm' /> <param name='linp' doc='A-bis Intput Subsystem' /> diff --git a/include/osmo-bts/logging.h b/include/osmo-bts/logging.h index 852c383..e2d6e30 100644 --- a/include/osmo-bts/logging.h +++ b/include/osmo-bts/logging.h @@ -20,7 +20,7 @@ DLOOP, DABIS, DRTP, - DSUM, + DBTS, }; extern const struct log_info bts_log_info; diff --git a/src/common/bts.c b/src/common/bts.c index da41176..8d966c9 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -306,7 +306,7 @@ { int i, j; - LOGP(DSUM, LOGL_INFO, "Main link established, sending Status'.\n"); + LOGP(DBTS, LOGL_INFO, "Main link established, sending Status'.\n"); /* BTS and SITE MGR are EANBLED, BTS is DEPENDENCY */ oml_tx_state_changed(&bts->site_mgr.mo); @@ -342,7 +342,7 @@ uint8_t radio_state = link ? NM_OPSTATE_ENABLED : NM_OPSTATE_DISABLED; int rc; - LOGP(DSUM, LOGL_INFO, "RSL link (TRX %02x) state changed to %s, sending Status'.\n", + LOGP(DBTS, LOGL_INFO, "RSL link (TRX %02x) state changed to %s, sending Status'.\n", trx->nr, link ? "up" : "down"); oml_mo_state_chg(&trx->mo, radio_state, NM_AVSTATE_OK); @@ -366,7 +366,7 @@ { int tn; - LOGP(DSUM, LOGL_INFO, "TRX(%d): Setting available = %d\n", + LOGP(DBTS, LOGL_INFO, "TRX(%d): Setting available = %d\n", trx->nr, avail); if (avail) { int op_state = trx->rsl_link ? NM_OPSTATE_ENABLED : NM_OPSTATE_DISABLED; @@ -632,7 +632,7 @@ struct gsm48_imm_ass_rej *imm_ass_cmd = msgb_l3(msg); if (bts->agch_queue.length > hard_limit) { - LOGP(DSUM, LOGL_ERROR, + LOGP(DBTS, LOGL_ERROR, "AGCH: too many messages in queue, " "refusing message type %s, length = %d/%d\n", gsm48_rr_msg_name(((struct gsm48_imm_ass *)msgb_l3(msg))->msg_type), diff --git a/src/common/logging.c b/src/common/logging.c index 8340736..e5d26b2 100644 --- a/src/common/logging.c +++ b/src/common/logging.c @@ -136,9 +136,9 @@ .enabled = 1, .loglevel = LOGL_DEBUG, }, #endif - [DSUM] = { - .name = "DSUM", - .description = "DSUM", + [DBTS] = { + .name = "DBTS", + .description = "Base Transceiver Station", .loglevel = LOGL_NOTICE, .enabled = 1, }, diff --git a/src/common/vty.c b/src/common/vty.c index 2558ba8..b81827d 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -1741,5 +1741,8 @@ install_node(&phy_inst_node, config_write_dummy); + /* Ensure backwards compatibility with older config files */ + logging_vty_add_deprecated_subsys(bts, "sum"); + return 0; } diff --git a/src/osmo-bts-virtual/main.c b/src/osmo-bts-virtual/main.c index c329f3a..4dd944a 100644 --- a/src/osmo-bts-virtual/main.c +++ b/src/osmo-bts-virtual/main.c @@ -82,7 +82,7 @@ void bts_model_print_help() { - LOGP(DSUM, LOGL_NOTICE, "Unimplemented %s\n", __func__); + LOGP(DBTS, LOGL_NOTICE, "Unimplemented %s\n", __func__); } int bts_model_handle_options(int argc, char **argv) @@ -127,18 +127,18 @@ void bts_model_phy_instance_set_defaults(struct phy_instance *pinst) { - LOGP(DSUM, LOGL_NOTICE, "Unimplemented %s\n", __func__); + LOGP(DBTS, LOGL_NOTICE, "Unimplemented %s\n", __func__); } int bts_model_ts_disconnect(struct gsm_bts_trx_ts *ts) { - LOGP(DSUM, LOGL_NOTICE, "Unimplemented %s\n", __func__); + LOGP(DBTS, LOGL_NOTICE, "Unimplemented %s\n", __func__); return -ENOTSUP; } void bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan) { - LOGP(DSUM, LOGL_NOTICE, "Unimplemented %s\n", __func__); + LOGP(DBTS, LOGL_NOTICE, "Unimplemented %s\n", __func__); } int main(int argc, char **argv) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia9db783bc92b23ba87b4fdf1e4ed07d59ea6bbce Gerrit-Change-Number: 16145 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <axilirator at gmail.com> Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20191121/2c9a5f79/attachment.htm>