<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/21648">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">migrate to DLBSSGP as log sub-system for BSSGP<br><br>Change-Id: I94864c5fa2688fc91b8b6077a14ad098851afdc7<br>Depends: libosmocore.git Change-Id I506190aae9217c0956e4b5764d1a0c0772268e93<br>---<br>M TODO-RELEASE<br>M src/gprs_debug.cpp<br>M src/gprs_debug.h<br>M src/pcu_main.cpp<br>M tests/tbf/TbfTest.cpp<br>5 files changed, 8 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/TODO-RELEASE b/TODO-RELEASE</span><br><span>index 40932ee..eee6aa2 100644</span><br><span>--- a/TODO-RELEASE</span><br><span>+++ b/TODO-RELEASE</span><br><span>@@ -8,4 +8,4 @@</span><br><span> # If any interfaces have been removed or changed since the last public release: c:r:0.</span><br><span> #library what description / commit summary line</span><br><span> osmo-pcu update osmo-gsm-manuals dependency to > 0.3.0 for vty_cpu_sched.adoc include</span><br><span style="color: hsl(0, 100%, 40%);">-osmo-pcu update libosmocore dependency > 1.4.x for osmo_fd_{read,write}_{enable,disable}</span><br><span style="color: hsl(120, 100%, 40%);">+osmo-pcu update libosmocore dependency > 1.4.x for osmo_fd_{read,write}_{enable,disable}+DLBSSGP</span><br><span>diff --git a/src/gprs_debug.cpp b/src/gprs_debug.cpp</span><br><span>index da5974b..a790e3f 100644</span><br><span>--- a/src/gprs_debug.cpp</span><br><span>+++ b/src/gprs_debug.cpp</span><br><span>@@ -112,13 +112,6 @@</span><br><span> .loglevel = LOGL_NOTICE,</span><br><span> .enabled = 1,</span><br><span> },</span><br><span style="color: hsl(0, 100%, 40%);">- [DBSSGP] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "DBSSGP",</span><br><span style="color: hsl(0, 100%, 40%);">- .color = "\033[1;34m",</span><br><span style="color: hsl(0, 100%, 40%);">- .description = "GPRS BSS Gateway Protocol (BSSGP)",</span><br><span style="color: hsl(0, 100%, 40%);">- .loglevel = LOGL_NOTICE,</span><br><span style="color: hsl(0, 100%, 40%);">- .enabled = 1,</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span> [DPCU] = {</span><br><span> .name = "DPCU",</span><br><span> .color = "\033[1;35m",</span><br><span>diff --git a/src/gprs_debug.h b/src/gprs_debug.h</span><br><span>index 4c57633..84a0a07 100644</span><br><span>--- a/src/gprs_debug.h</span><br><span>+++ b/src/gprs_debug.h</span><br><span>@@ -27,6 +27,10 @@</span><br><span> };</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* we used to have DBSSGP definded in each application, and applications telling</span><br><span style="color: hsl(120, 100%, 40%);">+ * libosmogb which sub-system to use. That creates problems and has been deprecated */</span><br><span style="color: hsl(120, 100%, 40%);">+#define DBSSGP DLBSSGP</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Debug Areas of the code */</span><br><span> enum {</span><br><span> DCSN1,</span><br><span>@@ -41,7 +45,6 @@</span><br><span> DTBFDL,</span><br><span> DTBFUL,</span><br><span> DNS,</span><br><span style="color: hsl(0, 100%, 40%);">- DBSSGP,</span><br><span> DPCU,</span><br><span> aDebug_LastEntry</span><br><span> };</span><br><span>diff --git a/src/pcu_main.cpp b/src/pcu_main.cpp</span><br><span>index 2138fd9..16d73de 100644</span><br><span>--- a/src/pcu_main.cpp</span><br><span>+++ b/src/pcu_main.cpp</span><br><span>@@ -43,6 +43,7 @@</span><br><span> #include <osmocom/vty/command.h></span><br><span> #include <osmocom/vty/vty.h></span><br><span> #include <osmocom/vty/ports.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/vty/logging.h></span><br><span> #include <osmocom/vty/cpu_sched_vty.h></span><br><span> #include <osmocom/core/rate_ctr.h></span><br><span> #include <osmocom/core/select.h></span><br><span>@@ -242,12 +243,12 @@</span><br><span> </span><br><span> osmo_stats_init(tall_pcu_ctx);</span><br><span> rate_ctr_init(tall_pcu_ctx);</span><br><span style="color: hsl(0, 100%, 40%);">- bssgp_set_log_ss(DBSSGP);</span><br><span> </span><br><span> pcu_vty_info.tall_ctx = tall_pcu_ctx;</span><br><span> vty_init(&pcu_vty_info);</span><br><span> pcu_vty_init();</span><br><span> osmo_cpu_sched_vty_init(tall_pcu_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ logging_vty_add_deprecated_subsys(tall_pcu_ctx, "bssgp");</span><br><span> </span><br><span> handle_options(argc, argv);</span><br><span> if ((!!spoof_mcc) + (!!spoof_mnc) == 1) {</span><br><span>diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp</span><br><span>index 505f510..1a1dc6f 100644</span><br><span>--- a/tests/tbf/TbfTest.cpp</span><br><span>+++ b/tests/tbf/TbfTest.cpp</span><br><span>@@ -3256,9 +3256,8 @@</span><br><span> osmo_init_logging2(tall_pcu_ctx, &gprs_log_info);</span><br><span> log_set_use_color(osmo_stderr_target, 0);</span><br><span> log_set_print_filename(osmo_stderr_target, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- bssgp_set_log_ss(DBSSGP);</span><br><span> log_parse_category_mask(osmo_stderr_target, "DRLCMAC,1:DRLCMACDATA,3:DRLCMACDL,3:DRLCMACUL,3:"</span><br><span style="color: hsl(0, 100%, 40%);">- "DRLCMACSCHED,1:DRLCMACMEAS,3:DNS,3:DBSSGP,3:DPCU,5:"</span><br><span style="color: hsl(120, 100%, 40%);">+ "DRLCMACSCHED,1:DRLCMACMEAS,3:DNS,3:DLBSSGP,3:DPCU,5:"</span><br><span> "DL1IF,6:DTBF,1:DTBFUL,1:DTBFDL,1:DLGLOBAL,2:");</span><br><span> </span><br><span> vty_init(&pcu_vty_info);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/21648">change 21648</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-pcu/+/21648"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I94864c5fa2688fc91b8b6077a14ad098851afdc7 </div>
<div style="display:none"> Gerrit-Change-Number: 21648 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </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-MessageType: merged </div>