cellular-infrastructure
/
osmo-pcu
mirror of https://gerrit.osmocom.org/osmo-pcu
9
0
Fork 1
Code Issues Releases Wiki Activity

migrate to DLBSSGP as log sub-system for BSSGP 

Change-Id: I94864c5fa2688fc91b8b6077a14ad098851afdc7
Depends: libosmocore.git Change-Id I506190aae9217c0956e4b5764d1a0c0772268e93
This commit is contained in:
Harald Welte 2020-12-10 13:39:21 +01:00
parent b645365546
commit 398f60e11c
5 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO-RELEASE
View File

@ -8,4 +8,4 @@
# If any interfaces have been removed or changed since the last public release: c:r:0.
#library what description / commit summary line
osmo-pcu update osmo-gsm-manuals dependency to > 0.3.0 for vty_cpu_sched.adoc include
osmo-pcu update libosmocore dependency > 1.4.x for osmo_fd_{read,write}_{enable,disable}
osmo-pcu update libosmocore dependency > 1.4.x for osmo_fd_{read,write}_{enable,disable}+DLBSSGP

7
src/gprs_debug.cpp
View File

@ -112,13 +112,6 @@ static const struct log_info_cat default_categories[] = {
.loglevel = LOGL_NOTICE,
.enabled = 1,
},
[DBSSGP] = {
.name = "DBSSGP",
.color = "\033[1;34m",
.description = "GPRS BSS Gateway Protocol (BSSGP)",
.loglevel = LOGL_NOTICE,
.enabled = 1,
},
[DPCU] = {
.name = "DPCU",
.color = "\033[1;35m",

5
src/gprs_debug.h
View File

@ -27,6 +27,10 @@ extern "C" {
};
#endif
/* we used to have DBSSGP definded in each application, and applications telling
* libosmogb which sub-system to use. That creates problems and has been deprecated */
#define DBSSGP DLBSSGP
/* Debug Areas of the code */
enum {
DCSN1,
@ -41,7 +45,6 @@ enum {
DTBFDL,
DTBFUL,
DNS,
DBSSGP,
DPCU,
aDebug_LastEntry
};

3
src/pcu_main.cpp
View File

@ -43,6 +43,7 @@ extern "C" {
#include <osmocom/vty/command.h>
#include <osmocom/vty/vty.h>
#include <osmocom/vty/ports.h>
#include <osmocom/vty/logging.h>
#include <osmocom/vty/cpu_sched_vty.h>
#include <osmocom/core/rate_ctr.h>
#include <osmocom/core/select.h>
@ -242,12 +243,12 @@ int main(int argc, char *argv[])
osmo_stats_init(tall_pcu_ctx);
rate_ctr_init(tall_pcu_ctx);
bssgp_set_log_ss(DBSSGP);
pcu_vty_info.tall_ctx = tall_pcu_ctx;
vty_init(&pcu_vty_info);
pcu_vty_init();
osmo_cpu_sched_vty_init(tall_pcu_ctx);
logging_vty_add_deprecated_subsys(tall_pcu_ctx, "bssgp");
handle_options(argc, argv);
if ((!!spoof_mcc) + (!!spoof_mnc) == 1) {

3
tests/tbf/TbfTest.cpp
View File

@ -3256,9 +3256,8 @@ int main(int argc, char **argv)
osmo_init_logging2(tall_pcu_ctx, &gprs_log_info);
log_set_use_color(osmo_stderr_target, 0);
log_set_print_filename(osmo_stderr_target, 0);
bssgp_set_log_ss(DBSSGP);
log_parse_category_mask(osmo_stderr_target, "DRLCMAC,1:DRLCMACDATA,3:DRLCMACDL,3:DRLCMACUL,3:"
"DRLCMACSCHED,1:DRLCMACMEAS,3:DNS,3:DBSSGP,3:DPCU,5:"
"DRLCMACSCHED,1:DRLCMACMEAS,3:DNS,3:DLBSSGP,3:DPCU,5:"
"DL1IF,6:DTBF,1:DTBFUL,1:DTBFDL,1:DLGLOBAL,2:");
vty_init(&pcu_vty_info);