Build failure of network:osmocom:nightly/libosmo-netif in Debian_9.0/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_9.0/armv7l Package network:osmocom:nightly/libosmo-netif failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: [ 259s] | ac_cv_env_CPP_set= [ 259s] | ac_cv_env_CPP_value= [ 259s] | ac_cv_env_LDFLAGS_set=set [ 259s] | ac_cv_env_LDFLAGS_value='-Wl,-z,relro -Wl,-z,now' [ 259s] | ac_cv_env_LIBOSMOABIS_CFLAGS_set= [ 259s] | ac_cv_env_LIBOSMOABIS_CFLAGS_value= [ 259s] | ac_cv_env_LIBOSMOABIS_LIBS_set= [ 259s] | ac_cv_env_LIBOSMOABIS_LIBS_value= [ 259s] | ac_cv_env_LIBOSMOCORE_CFLAGS_set= [ 259s] | ac_cv_env_LIBOSMOCORE_CFLAGS_value= [ 259s] | ac_cv_env_LIBOSMOCORE_LIBS_set= [ 259s] | ac_cv_env_LIBOSMOCORE_LIBS_value= [ 259s] | ac_cv_env_LIBOSMOGSM_CFLAGS_set= [ 259s] | ac_cv_env_LIBOSMOGSM_CFLAGS_value= [ 259s] | ac_cv_env_LIBOSMOGSM_LIBS_set= [ 259s] | ac_cv_env_LIBOSMOGSM_LIBS_value= [ 259s] | ac_cv_env_LIBS_set= [ 259s] | ac_cv_env_LIBS_value= [ 259s] | ac_cv_env_LT_SYS_LIBRARY_PATH_set= [ 259s] | ac_cv_env_LT_SYS_LIBRARY_PATH_value= [ 259s] | ac_cv_env_PKG_CONFIG_LIBDIR_set= [ 259s] | ac_cv_env_PKG_CONFIG_LIBDIR_value= [ 259s] | ac_cv_env_PKG_CONFIG_PATH_set= [ 261s] | ac_cv_env_[ 220.959085] sysrq: SysRq : Power Off [ 261s] [ 220.961539] reboot: Power down [ 261s] ### VM INTERACTION END ### [ 261s] [ 261s] armbuild10 failed "build libosmo-netif_0.6.0.2.a1e9.dsc" at Thu Sep 19 02:08:12 UTC 2019. [ 261s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 428s] ar: `u' modifier ignored since `D' is the default (see `U') [ 428s] libtool: link: ranlib .libs/libtransceiver_common.a [ 428s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 428s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 429s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 429s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 429s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 429s] collect2: error: ld returned 1 exit status [ 429s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 429s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 429s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 429s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 429s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 429s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 429s] make[1]: *** [Makefile:444: all] Error 2 [ 429s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 429s] dh_auto_build: make -j1 returned exit code 2 [ 429s] make: *** [debian/rules:6: build] Error 255 [ 429s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 429s] [ 429s] lamb60 failed "build osmo-trx_1.1.1.25.2538.dsc" at Thu Sep 19 01:48:40 UTC 2019. [ 429s] [ 429s] ### VM INTERACTION START ### [ 432s] [ 413.516550] sysrq: SysRq : Power Off [ 432s] [ 413.526935] reboot: Power down [ 432s] ### VM INTERACTION END ### [ 432s] [ 432s] lamb60 failed "build osmo-trx_1.1.1.25.2538.dsc" at Thu Sep 19 01:48:43 UTC 2019. [ 432s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/libosmo-netif in Debian_8.0/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_8.0/x86_64 Package network:osmocom:nightly/libosmo-netif failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: [ 124s] autoreconnecting test step 3 [client OK, server OK], FD reg 1 [ 124s] [ 124s] autoreconnecting test step 2 [client OK, server OK], FD reg 0 [ 124s] + [ 124s] +autoreconnecting test step 1 [client OK, server OK], FD reg 0 [ 124s] connection closed with srv [ 124s] [ 124s] -autoreconnecting test step 1 [client OK, server NA], FD reg 0 [ 124s] +autoreconnecting test step 0 [client OK, server NA], FD reg 0 [ 124s] [ 124s] non-reconnecting test step 7 [client NA, server OK], FD reg 1 [ 124s] [ 124s] 1. testsuite.at:4: 1. stream_test (testsuite.at:4): FAILED (testsuite.at:8) [ 124s] debian/rules:27: recipe for target 'override_dh_auto_test' failed [ 124s] make[1]: *** [override_dh_auto_test] Error 1 [ 124s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 124s] debian/rules:13: recipe for target 'build' failed [ 124s] make: *** [build] Error 2 [ 124s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 124s] [ 124s] build30 failed "build libosmo-netif_0.6.0.2.a1e9.dsc" at Thu Sep 19 01:44:36 UTC 2019. [ 124s] [ 124s] ### VM INTERACTION START ### [ 125s] Powering off. [ 125s] [ 106.236806] reboot: Power down [ 125s] ### VM INTERACTION END ### [ 125s] [ 125s] build30 failed "build libosmo-netif_0.6.0.2.a1e9.dsc" at Thu Sep 19 01:44:38 UTC 2019. [ 125s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 244s] ar: `u' modifier ignored since `D' is the default (see `U') [ 244s] libtool: link: ranlib .libs/libtransceiver_common.a [ 244s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 244s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 245s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 245s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 245s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 245s] collect2: error: ld returned 1 exit status [ 245s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 245s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 245s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 245s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 245s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 245s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 245s] make[1]: *** [Makefile:444: all] Error 2 [ 245s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 245s] dh_auto_build: make -j1 returned exit code 2 [ 245s] make: *** [debian/rules:6: build] Error 255 [ 245s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 245s] [ 245s] build85 failed "build osmo-trx_1.1.1.15.923b.dsc" at Thu Sep 19 01:07:18 UTC 2019. [ 245s] [ 245s] ### VM INTERACTION START ### [ 248s] [ 235.570474] sysrq: SysRq : Power Off [ 248s] [ 235.572474] reboot: Power down [ 248s] ### VM INTERACTION END ### [ 248s] [ 248s] build85 failed "build osmo-trx_1.1.1.15.923b.dsc" at Thu Sep 19 01:07:22 UTC 2019. [ 248s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Change in ...osmo-ttcn3-hacks[master]: PCU_Tests_RAW.ttcn: introduce TC_ta_init_prach to test initial TA
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15410 ) Change subject: PCU_Tests_RAW.ttcn: introduce TC_ta_init_prach to test initial TA .. Patch Set 9: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15410 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I21f76ae723519c0eb54515922a05ca8045b00ade Gerrit-Change-Number: 15410 Gerrit-PatchSet: 9 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 18 Sep 2019 21:17:47 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: library/PCUIF_CodecPort.ttcn: strip padding bytes from PCUIF_data
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15571
Change subject: library/PCUIF_CodecPort.ttcn: strip padding bytes from
PCUIF_data
..
library/PCUIF_CodecPort.ttcn: strip padding bytes from PCUIF_data
In Ieefa61232eb215a19a02e490255332e28e23b8f8, I had to revert
I5808954b5c67c3239e795e43ae77035152d359ef, because that change
broke encoding of messages on the PCU interface.
Since we cannot use 'PADDING' attribute until its implementation
is fixed in TITAN, let's work this around by stripping padding
bytes manually in UD_to_PCUIF().
Change-Id: Ibd698094c897d395208e80189457444a91018beb
---
M library/PCUIF_CodecPort.ttcn
1 file changed, 16 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/71/15571/1
diff --git a/library/PCUIF_CodecPort.ttcn b/library/PCUIF_CodecPort.ttcn
index 3d6ceac..caeceb2 100644
--- a/library/PCUIF_CodecPort.ttcn
+++ b/library/PCUIF_CodecPort.ttcn
@@ -26,9 +26,25 @@
pout.data := enc_PCUIF_Message(pin.data);
} with { extension "prototype(fast)" };
+private function fix_padding(inout PCUIF_data data) {
+ var octetstring res;
+
+ for (var integer i := 0; i < data.len; i := i + 1) {
+ res[i] := data.data[i];
+ }
+
+ data.data := res;
+}
+
private function UD_to_PCUIF(in UD_send_data pin, out PCUIF_send_data pout) {
pout.id := pin.id;
pout.data := dec_PCUIF_Message(pin.data);
+
+ /* HACK: fix padding in decoded message. Due to a bug in TITAN, we
+* cannot just use its 'PADDING' attribute because it breaks decoding.
*/
+ if (ischosen(pout.data.u.data_req)) {
fix_padding(pout.data.u.data_req); }
+ if (ischosen(pout.data.u.data_cnf)) {
fix_padding(pout.data.u.data_cnf); }
+ if (ischosen(pout.data.u.data_ind)) {
fix_padding(pout.data.u.data_ind); }
} with { extension "prototype(fast)" };
type port PCUIF_CODEC_PT message {
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15571
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ibd698094c897d395208e80189457444a91018beb
Gerrit-Change-Number: 15571
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in ...osmo-ttcn3-hacks[master]: Introduce PCUIF, BTS and ClckGen components for RAW PCU test cases
Hello pespin, laforge, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15430 to look at the new patch set (#8). Change subject: Introduce PCUIF, BTS and ClckGen components for RAW PCU test cases .. Introduce PCUIF, BTS and ClckGen components for RAW PCU test cases The problem of existing test cases is that they mix IUT (i.e. OsmoPCU) with OsmoBTS (osmo-bts-virtual) and OsmocomBB (virt_phy). This approach allows to avoid dealing with TDMA clock indications and RTS requests on the PCU interface - this is done by OsmoBTS. On the other hand, our test scenarios may be potentially affected by undiscovered bugs in OsmoBTS and the virt_phy. In order to solve that problem, this change introduces a set of new components and the corresponding handler functions: - RAW_PCUIF_CT / f_PCUIF_CT_handler() - PCU interface (UNIX domain socket) handler. Creates a server listening for incoming connections on a given 'pcu_sock_path', handles connection establishment and message forwarding between connected BTS components (see below) and OsmoPCU. - RAW_PCU_BTS_CT / f_BTS_CT_handler() - represents a single BTS entity, connected to OsmoPCU through the RAW_PCUIF_CT. Takes care about sending System Information 13 to OsmoPCU, forwarding TDMA clock indications from a dedicated ClckGen component (see below), and filtering the received messages by the BTS number. - RAW_PCU_ClckGen_CT / f_ClckGen_CT_handler() - TDMA frame clock counter built on top of a timer. Sends clock indications to the BTS component. All components communicate using TTCN-3 ports and explicitly defined sets of messages (see RAW_PCU_Clock_PT and RAW_PCU_MSG_PT). One noticeable kind of such messages is events (see RAW_PCU_EVENT). That's how e.g. the PCUIF component can notify the BTS component that OsmoPCU has just connected, or the BTS component can notify the MTC that SI13 negotiation is completed. Furthermore, the proposed set of components allows to have more than one BTS entity, so we can also test multi-BTS operation in the future. +-+ +--+ +-+ | MTC +---+ PCUIF_CT +--+ OsmoPCU | +--+--+ ++-+ +-+ | | | | | | |+---+ | +---+ ++ BTS_CT #1 +--+ | ClckGen_CT #1 | |+-+-+ | +---+---+ | || | | +---+ | | |+---+ | +---+ ++ BTS_CT #2 +--+ | ClckGen_CT #2 | |+-+-+ | +---+---+ | || | | +---+ | | |+---+ | +---+ ++ BTS_CT #N +--+ | ClckGen_CT #N | +-+-+ +---+---+ | | +---+ Change-Id: I63a23abebab88fd5318eb4d907d6028e7c38e9a3 --- M library/PCUIF_Types.ttcn A pcu/PCUIF_RAW_Components.ttcn M pcu/PCU_Tests_RAW.ttcn 3 files changed, 319 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/30/15430/8 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15430 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I63a23abebab88fd5318eb4d907d6028e7c38e9a3 Gerrit-Change-Number: 15430 Gerrit-PatchSet: 8 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-ttcn3-hacks[master]: PCU_Tests_RAW.ttcn: add test case for UL link quality adaptation
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15526 to look at the new patch set (#2). Change subject: PCU_Tests_RAW.ttcn: add test case for UL link quality adaptation .. PCU_Tests_RAW.ttcn: add test case for UL link quality adaptation This change introduces a new test case TC_cs_lqual_ul_tbf, which is aimed to test the feedback of OsmoPCU on changing link quality measurements in Uplink Data blocks during an active TBF. Change-Id: Ia78d93e43a3c41b0b30e70df20a2da31077fd05f Related: SYS#4607 --- M library/RLCMAC_Types.ttcn M pcu/PCU_Tests_RAW.ttcn 2 files changed, 127 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/26/15526/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia78d93e43a3c41b0b30e70df20a2da31077fd05f Gerrit-Change-Number: 15526 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-bts[master]: bts-trx: Change super verbose IDLE ind not-supported line to DEBUG
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15537 ) Change subject: bts-trx: Change super verbose IDLE ind not-supported line to DEBUG .. Patch Set 1: Code-Review+2 Huh, so OsmoTRX somehow started to send them, and it did not before? o_O -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I64ee83b734ecff593ff2a1cf97b192db93228e22 Gerrit-Change-Number: 15537 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 18 Sep 2019 20:22:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-trx[master]: radioDevice: Introduce getTxGain() API
pespin has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-trx/+/15520 )
Change subject: radioDevice: Introduce getTxGain() API
..
radioDevice: Introduce getTxGain() API
It will be used in later commits by radioInterfaceMulti.
Change-Id: Ie3caca8971ed1e5370dfed6fb60716a24e7d82a5
---
M Transceiver52M/device/common/radioDevice.h
M Transceiver52M/device/lms/LMSDevice.h
M Transceiver52M/device/uhd/UHDDevice.cpp
M Transceiver52M/device/uhd/UHDDevice.h
M Transceiver52M/device/usrp1/USRPDevice.h
5 files changed, 25 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
daniel: Looks good to me, but someone else must approve
fixeria: Looks good to me, but someone else must approve
diff --git a/Transceiver52M/device/common/radioDevice.h
b/Transceiver52M/device/common/radioDevice.h
index b4928f2..1d85204 100644
--- a/Transceiver52M/device/common/radioDevice.h
+++ b/Transceiver52M/device/common/radioDevice.h
@@ -131,6 +131,9 @@
/** sets the transmit chan gain, returns the gain setting **/
virtual double setTxGain(double dB, size_t chan = 0) = 0;
+ /** get transmit gain */
+ virtual double getTxGain(size_t chan = 0) = 0;
+
/** return maximum Tx Gain **/
virtual double maxTxGain(void) = 0;
diff --git a/Transceiver52M/device/lms/LMSDevice.h
b/Transceiver52M/device/lms/LMSDevice.h
index 71a706c..1464c53 100644
--- a/Transceiver52M/device/lms/LMSDevice.h
+++ b/Transceiver52M/device/lms/LMSDevice.h
@@ -162,6 +162,11 @@
/** sets the transmit chan gain, returns the gain setting **/
double setTxGain(double dB, size_t chan = 0);
+ /** get transmit gain */
+ double getTxGain(size_t chan = 0) {
+ return tx_gains[chan];
+ }
+
/** return maximum Tx Gain **/
double maxTxGain(void);
diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp
b/Transceiver52M/device/uhd/UHDDevice.cpp
index 5b38df4..3b59291 100644
--- a/Transceiver52M/device/uhd/UHDDevice.cpp
+++ b/Transceiver52M/device/uhd/UHDDevice.cpp
@@ -310,6 +310,19 @@
return rx_gains[chan];
}
+double uhd_device::getTxGain(size_t chan)
+{
+ if (iface == MULTI_ARFCN)
+ chan = 0;
+
+ if (chan >= tx_gains.size()) {
+ LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;
+ return 0.0f;
+ }
+
+ return tx_gains[chan];
+}
+
/*
Parse the UHD device tree and mboard name to find out what device we're
dealing with. We need the window type so that the transceiver knows how to
diff --git a/Transceiver52M/device/uhd/UHDDevice.h
b/Transceiver52M/device/uhd/UHDDevice.h
index 944578a..44f7ebb 100644
--- a/Transceiver52M/device/uhd/UHDDevice.h
+++ b/Transceiver52M/device/uhd/UHDDevice.h
@@ -96,6 +96,7 @@
double minRxGain(void) { return rx_gain_min; }
double setTxGain(double db, size_t chan);
+ double getTxGain(size_t chan = 0);
double maxTxGain(void) { return tx_gain_max; }
double minTxGain(void) { return tx_gain_min; }
diff --git a/Transceiver52M/device/usrp1/USRPDevice.h
b/Transceiver52M/device/usrp1/USRPDevice.h
index 734b361..bb70648 100644
--- a/Transceiver52M/device/usrp1/USRPDevice.h
+++ b/Transceiver52M/device/usrp1/USRPDevice.h
@@ -171,6 +171,9 @@
/** sets the transmit chan gain, returns the gain setting **/
double setTxGain(double dB, size_t chan = 0);
+ /** get transmit gain */
+ double getTxGain(size_t chan = 0) { return txGain; }
+
/** return maximum Tx Gain **/
double maxTxGain(void);
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15520
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: Ie3caca8971ed1e5370dfed6fb60716a24e7d82a5
Gerrit-Change-Number: 15520
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...osmo-trx[master]: radioInterface{Multi, Resamp}: Fix successful writeSamples() masking u...
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-trx/+/15523 )
Change subject: radioInterface{Multi,Resamp}: Fix successful writeSamples()
masking underrun from readSamples()
..
Patch Set 1: Code-Review+2
+1+1=+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15523
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I3239b1df4536c080365106b3e4daa523b57f5dff
Gerrit-Change-Number: 15523
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-Comment-Date: Wed, 18 Sep 2019 19:16:34 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in ...osmo-trx[master]: radioInterface{Multi, Resamp}: Fix successful writeSamples() masking u...
pespin has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-trx/+/15523 )
Change subject: radioInterface{Multi,Resamp}: Fix successful writeSamples()
masking underrun from readSamples()
..
radioInterface{Multi,Resamp}: Fix successful writeSamples() masking underrun
from readSamples()
The only who should be setting class instance value "underrun" to false
is isUnderrun().
Similar fixes were already applied lately to radioInterface.cpp.
Change-Id: I3239b1df4536c080365106b3e4daa523b57f5dff
---
M Transceiver52M/radioInterfaceMulti.cpp
M Transceiver52M/radioInterfaceResamp.cpp
2 files changed, 6 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/Transceiver52M/radioInterfaceMulti.cpp
b/Transceiver52M/radioInterfaceMulti.cpp
index 4022d3a..99f6231 100644
--- a/Transceiver52M/radioInterfaceMulti.cpp
+++ b/Transceiver52M/radioInterfaceMulti.cpp
@@ -309,6 +309,7 @@
/* Send a timestamped chunk to the device */
bool RadioInterfaceMulti::pushBuffer()
{
+ bool local_underrun;
if (sendBuffer[0]->getAvailSegments() <= 0)
return false;
@@ -341,12 +342,13 @@
size_t num = mDevice->writeSamples(convertSendBuffer,
outerSendBuffer->size(),
- ,
+ _underrun,
writeTimestamp);
if (num != outerSendBuffer->size()) {
LOG(ALERT) << "Transmit error " << num;
}
+ underrun |= local_underrun;
writeTimestamp += num;
return true;
diff --git a/Transceiver52M/radioInterfaceResamp.cpp
b/Transceiver52M/radioInterfaceResamp.cpp
index d6dc52c..864cdee 100644
--- a/Transceiver52M/radioInterfaceResamp.cpp
+++ b/Transceiver52M/radioInterfaceResamp.cpp
@@ -204,6 +204,7 @@
/* Send a timestamped chunk to the device */
bool RadioInterfaceResamp::pushBuffer()
{
+ bool local_underrun;
int rc;
size_t numSent;
@@ -225,12 +226,13 @@
numSent = mDevice->writeSamples(convertSendBuffer,
resamp_outchunk,
- ,
+ _underrun,
writeTimestamp);
if (numSent != resamp_outchunk) {
LOG(ALERT) << "Transmit error " << numSent;
}
+ underrun |= local_underrun;
writeTimestamp += resamp_outchunk;
return true;
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15523
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I3239b1df4536c080365106b3e4daa523b57f5dff
Gerrit-Change-Number: 15523
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...osmo-trx[master]: UHDDevice: Drop unneeded MULTI_ARFCN checks
pespin has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-trx/+/15522 )
Change subject: UHDDevice: Drop unneeded MULTI_ARFCN checks
..
UHDDevice: Drop unneeded MULTI_ARFCN checks
After previous changes, radioInterfaceMulti is expected to handle channel
conversion correctly, so it will always use chan 0 for all these
functions. This simplifies code in radioDevice avoiding need to add
checks to all devices supporting multi-arfcn in the future.
Change-Id: Ib2cd50a6ceaeedc6aaf3e1bb51d33b52911b6eba
---
M Transceiver52M/device/uhd/UHDDevice.cpp
1 file changed, 0 insertions(+), 12 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp
b/Transceiver52M/device/uhd/UHDDevice.cpp
index 3b59291..809bade 100644
--- a/Transceiver52M/device/uhd/UHDDevice.cpp
+++ b/Transceiver52M/device/uhd/UHDDevice.cpp
@@ -247,9 +247,6 @@
double uhd_device::setTxGain(double db, size_t chan)
{
- if (iface == MULTI_ARFCN)
- chan = 0;
-
if (chan >= tx_gains.size()) {
LOGC(DDEV, ALERT) << "Requested non-existent channel" << chan;
return 0.0f;
@@ -281,9 +278,6 @@
double uhd_device::setRxGain(double db, size_t chan)
{
- if (iface == MULTI_ARFCN)
- chan = 0;
-
if (chan >= rx_gains.size()) {
LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;
return 0.0f;
@@ -299,9 +293,6 @@
double uhd_device::getRxGain(size_t chan)
{
- if (iface == MULTI_ARFCN)
- chan = 0;
-
if (chan >= rx_gains.size()) {
LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;
return 0.0f;
@@ -312,9 +303,6 @@
double uhd_device::getTxGain(size_t chan)
{
- if (iface == MULTI_ARFCN)
- chan = 0;
-
if (chan >= tx_gains.size()) {
LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan;
return 0.0f;
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15522
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: Ib2cd50a6ceaeedc6aaf3e1bb51d33b52911b6eba
Gerrit-Change-Number: 15522
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...osmo-trx[master]: radioInterfaceMulti: Override setTxGain() to avoid chan!=0 calls
pespin has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-trx/+/15521 )
Change subject: radioInterfaceMulti: Override setTxGain() to avoid chan!=0 calls
..
radioInterfaceMulti: Override setTxGain() to avoid chan!=0 calls
Change-Id: I7e67f660c3b0b009db59b405de603f6058021802
---
M Transceiver52M/radioInterface.cpp
M Transceiver52M/radioInterface.h
M Transceiver52M/radioInterfaceMulti.cpp
3 files changed, 19 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/Transceiver52M/radioInterface.cpp
b/Transceiver52M/radioInterface.cpp
index 9c7c044..6e49a75 100644
--- a/Transceiver52M/radioInterface.cpp
+++ b/Transceiver52M/radioInterface.cpp
@@ -112,7 +112,7 @@
if (atten < 0.0)
atten = 0.0;
- rfGain = mDevice->setTxGain(mDevice->maxTxGain() - (double) atten, chan);
+ rfGain = setTxGain(mDevice->maxTxGain() - (double) atten, chan);
digAtten = (double) atten - mDevice->maxTxGain() + rfGain;
if (digAtten < 1.0)
@@ -307,6 +307,11 @@
return mDevice->setRxGain(dB, chan);
}
+double RadioInterface::setTxGain(double dB, size_t chan)
+{
+ return mDevice->setTxGain(dB, chan);
+}
+
/* Receive a timestamped chunk from the device */
int RadioInterface::pullBuffer()
{
diff --git a/Transceiver52M/radioInterface.h b/Transceiver52M/radioInterface.h
index 945624a..83e00b9 100644
--- a/Transceiver52M/radioInterface.h
+++ b/Transceiver52M/radioInterface.h
@@ -134,6 +134,9 @@
/** drive synchronization of Tx/Rx of USRP */
void alignRadio();
+ /** set transmit gain */
+ virtual double setTxGain(double dB, size_t chan = 0);
+
friend void *AlignRadioServiceLoopAdapter(RadioInterface*);
};
@@ -157,6 +160,7 @@
private:
bool pushBuffer();
int pullBuffer();
+ virtual double setTxGain(double dB, size_t chan);
signalVector *outerSendBuffer;
signalVector *outerRecvBuffer;
diff --git a/Transceiver52M/radioInterfaceMulti.cpp
b/Transceiver52M/radioInterfaceMulti.cpp
index c41ec22..4022d3a 100644
--- a/Transceiver52M/radioInterfaceMulti.cpp
+++ b/Transceiver52M/radioInterfaceMulti.cpp
@@ -405,3 +405,12 @@
else
return mDevice->getRxGain();
}
+
+double RadioInterfaceMulti::setTxGain(double dB, size_t chan)
+{
+ if (chan == 0)
+ return mDevice->setTxGain(dB);
+ else
+ return mDevice->getTxGain();
+
+}
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15521
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I7e67f660c3b0b009db59b405de603f6058021802
Gerrit-Change-Number: 15521
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...osmo-trx[master]: UHDDevice: Drop unneeded MULTI_ARFCN checks
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15522 ) Change subject: UHDDevice: Drop unneeded MULTI_ARFCN checks .. Patch Set 1: +1+1=+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15522 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ib2cd50a6ceaeedc6aaf3e1bb51d33b52911b6eba Gerrit-Change-Number: 15522 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 18 Sep 2019 19:16:20 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-trx[master]: UHDDevice: Drop unneeded MULTI_ARFCN checks
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15522 ) Change subject: UHDDevice: Drop unneeded MULTI_ARFCN checks .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15522 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ib2cd50a6ceaeedc6aaf3e1bb51d33b52911b6eba Gerrit-Change-Number: 15522 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 18 Sep 2019 19:16:24 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-pcu[master]: configure.ac: set C and C++ dialects
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15565 ) Change subject: configure.ac: set C and C++ dialects .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15565 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia57ba101627e3cc0babeca82631e207a3e2e0960 Gerrit-Change-Number: 15565 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 18 Sep 2019 17:51:37 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-trx[master]: Move multi-ARFCN chan amount modification from UHDDevice to parent class
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15542 ) Change subject: Move multi-ARFCN chan amount modification from UHDDevice to parent class .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15542 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I24d6c66bb3195ba2513b4a67daa14cdfbacdce6d Gerrit-Change-Number: 15542 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 18 Sep 2019 17:51:18 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-trx[master]: radioInterface: Mark setRxGain as virtual
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15541 ) Change subject: radioInterface: Mark setRxGain as virtual .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15541 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ie41efab1e60b88677bbd1ec333ea656794503a5a Gerrit-Change-Number: 15541 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 18 Sep 2019 17:50:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-trx[master]: Transceiver: Fixed copying of history into and from channelizer buffer.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15413 ) Change subject: Transceiver: Fixed copying of history into and from channelizer buffer. .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15413 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I93e43f6868cd67e69fc59d2980a03550d2505bf8 Gerrit-Change-Number: 15413 Gerrit-PatchSet: 2 Gerrit-Owner: timojacobus Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Reviewer: timojacobus Gerrit-Reviewer: tnt Gerrit-Comment-Date: Wed, 18 Sep 2019 17:49:47 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-trx[master]: radioInterface: Atomically fetch and change underrun variable
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15524 ) Change subject: radioInterface: Atomically fetch and change underrun variable .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15524/1/Transceiver52M/radioInterface.cpp File Transceiver52M/radioInterface.cpp: https://gerrit.osmocom.org/#/c/15524/1/Transceiver52M/radioInterface.cpp@293 PS1, Line 293: __sync_fetch_and_and Is it a compiler-specific (non-standard) feature? If so, configure.ac needs to be updated with the related checks. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I684e0a5d2a9583a161d5a6593559b3a9e7cd57e3 Gerrit-Change-Number: 15524 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 18 Sep 2019 17:48:49 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: Revert "MGCP: fix pattern warning"
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15570 ) Change subject: Revert "MGCP: fix pattern warning" .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15570 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I81d105b951590310c67f14f0b5d0c2777e206c5e Gerrit-Change-Number: 15570 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Comment-Date: Wed, 18 Sep 2019 17:47:23 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: Revert "MGCP: fix pattern warning"
neels has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15570 )
Change subject: Revert "MGCP: fix pattern warning"
..
Revert "MGCP: fix pattern warning"
For me this change causes MGCP parsing errors:
setverdict(fail): pass -> fail reason: "Could not extract parameters for
code "C""
Apparently the \r is after all necessary to parse MGCP. Maybe the '\r' is
implicit when an '\n' occurs, but the non-SDP part of MGCP has *only* '\r' line
breaks.
This reverts commit a9a52fff15227710e1a3a2e6222a388a3da11168.
Change-Id: I81d105b951590310c67f14f0b5d0c2777e206c5e
---
M library/MGCP_Types.ttcn
1 file changed, 5 insertions(+), 5 deletions(-)
Approvals:
Jenkins Builder: Verified
neels: Looks good to me, approved
diff --git a/library/MGCP_Types.ttcn b/library/MGCP_Types.ttcn
index 6febc51..b56734c 100644
--- a/library/MGCP_Types.ttcn
+++ b/library/MGCP_Types.ttcn
@@ -54,7 +54,7 @@
MgcpVersion ver
} with {
variant "SEPARATOR(' ', '[\t ]+')"
- variant "END('\n', '([\n])|(\n)')"
+ variant "END('\r\n', '([\r\n])|(\r\n)')"
}
type record MgcpParameter {
@@ -63,7 +63,7 @@
} with {
variant "BEGIN('')"
variant "SEPARATOR(': ', ':[\t ]+')"
- variant "END('\n', '([\n])|(\n)')"
+ variant "END('\r\n', '([\r\n])|(\r\n)')"
}
type set of MgcpParameter MgcpParameterList with {
@@ -76,7 +76,7 @@
SDP_Message sdp optional
} with {
variant "BEGIN('')"
- variant (sdp) "BEGIN('\n','([\n])|(\n)')"
+ variant (sdp) "BEGIN('\r\n','([\r\n])|(\r\n)')"
}
external function enc_MgcpCommand(in MgcpCommand id) return charstring
@@ -90,7 +90,7 @@
charstring string optional
} with {
variant "SEPARATOR(' ', '[\t ]+')"
- variant "END('\n', '([\n])|(\n)')"
+ variant "END('\r\n', '([\r\n])|(\r\n)')"
}
type record MgcpResponse {
@@ -99,7 +99,7 @@
SDP_Message sdp optional
} with {
variant "BEGIN('')"
- variant (sdp) "BEGIN('\n','([\n])|(\n)')"
+ variant (sdp) "BEGIN('\r\n','([\r\n])|(\r\n)')"
}
external function enc_MgcpResponse(in MgcpResponse id) return charstring
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15570
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I81d105b951590310c67f14f0b5d0c2777e206c5e
Gerrit-Change-Number: 15570
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels
Gerrit-MessageType: merged
Change in ...osmo-ttcn3-hacks[master]: Revert "MGCP: fix pattern warning"
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15570
Change subject: Revert "MGCP: fix pattern warning"
..
Revert "MGCP: fix pattern warning"
For me this change causes MGCP parsing errors:
setverdict(fail): pass -> fail reason: "Could not extract parameters for
code "C""
Apparently the \r is after all necessary to parse MGCP. Maybe the '\r' is
implicit when an '\n' occurs, but the non-SDP part of MGCP has *only* '\r' line
breaks.
This reverts commit a9a52fff15227710e1a3a2e6222a388a3da11168.
Change-Id: I81d105b951590310c67f14f0b5d0c2777e206c5e
---
M library/MGCP_Types.ttcn
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/70/15570/1
diff --git a/library/MGCP_Types.ttcn b/library/MGCP_Types.ttcn
index 6febc51..b56734c 100644
--- a/library/MGCP_Types.ttcn
+++ b/library/MGCP_Types.ttcn
@@ -54,7 +54,7 @@
MgcpVersion ver
} with {
variant "SEPARATOR(' ', '[\t ]+')"
- variant "END('\n', '([\n])|(\n)')"
+ variant "END('\r\n', '([\r\n])|(\r\n)')"
}
type record MgcpParameter {
@@ -63,7 +63,7 @@
} with {
variant "BEGIN('')"
variant "SEPARATOR(': ', ':[\t ]+')"
- variant "END('\n', '([\n])|(\n)')"
+ variant "END('\r\n', '([\r\n])|(\r\n)')"
}
type set of MgcpParameter MgcpParameterList with {
@@ -76,7 +76,7 @@
SDP_Message sdp optional
} with {
variant "BEGIN('')"
- variant (sdp) "BEGIN('\n','([\n])|(\n)')"
+ variant (sdp) "BEGIN('\r\n','([\r\n])|(\r\n)')"
}
external function enc_MgcpCommand(in MgcpCommand id) return charstring
@@ -90,7 +90,7 @@
charstring string optional
} with {
variant "SEPARATOR(' ', '[\t ]+')"
- variant "END('\n', '([\n])|(\n)')"
+ variant "END('\r\n', '([\r\n])|(\r\n)')"
}
type record MgcpResponse {
@@ -99,7 +99,7 @@
SDP_Message sdp optional
} with {
variant "BEGIN('')"
- variant (sdp) "BEGIN('\n','([\n])|(\n)')"
+ variant (sdp) "BEGIN('\r\n','([\r\n])|(\r\n)')"
}
external function enc_MgcpResponse(in MgcpResponse id) return charstring
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15570
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I81d105b951590310c67f14f0b5d0c2777e206c5e
Gerrit-Change-Number: 15570
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 1262s] ar: `u' modifier ignored since `D' is the default (see `U') [ 1262s] libtool: link: ranlib .libs/libtransceiver_common.a [ 1262s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 1262s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 1263s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 1263s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 1263s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 1263s] collect2: error: ld returned 1 exit status [ 1263s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 1263s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 1263s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 1263s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 1263s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 1263s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 1263s] make[1]: *** [Makefile:444: all] Error 2 [ 1263s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 1263s] dh_auto_build: make -j1 returned exit code 2 [ 1263s] make: *** [debian/rules:6: build] Error 255 [ 1263s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 1264s] [ 1264s] cloud120 failed "build osmo-trx_1.1.1.15.923b.dsc" at Wed Sep 18 17:45:16 UTC 2019. [ 1264s] [ 1264s] ### VM INTERACTION START ### [ 1267s] [ 1208.012914] sysrq: SysRq : Power Off [ 1267s] [ 1208.030705] reboot: Power down [ 1268s] ### VM INTERACTION END ### [ 1268s] [ 1268s] cloud120 failed "build osmo-trx_1.1.1.15.923b.dsc" at Wed Sep 18 17:45:21 UTC 2019. [ 1268s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Change in ...osmo-trx[master]: UHDDevice: Drop unneeded MULTI_ARFCN checks
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15522 ) Change subject: UHDDevice: Drop unneeded MULTI_ARFCN checks .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15522 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ib2cd50a6ceaeedc6aaf3e1bb51d33b52911b6eba Gerrit-Change-Number: 15522 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 18 Sep 2019 17:44:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-trx[master]: radioInterfaceMulti: Override setTxGain() to avoid chan!=0 calls
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15521 ) Change subject: radioInterfaceMulti: Override setTxGain() to avoid chan!=0 calls .. Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/15521/1/Transceiver52M/radioInterfaceMulti.cpp File Transceiver52M/radioInterfaceMulti.cpp: https://gerrit.osmocom.org/#/c/15521/1/Transceiver52M/radioInterfaceMulti.cpp@411 PS1, Line 411: Cosmetic: other functions in this file are using two spaces as tab, so would be good to be consistent (neither I like tabs, but mixing is worse). -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I7e67f660c3b0b009db59b405de603f6058021802 Gerrit-Change-Number: 15521 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 18 Sep 2019 17:43:14 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 486s] ar: `u' modifier ignored since `D' is the default (see `U') [ 486s] libtool: link: ranlib .libs/libtransceiver_common.a [ 487s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 487s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 487s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 487s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 487s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 487s] collect2: error: ld returned 1 exit status [ 487s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 487s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 487s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 487s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 487s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 487s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 487s] make[1]: *** [Makefile:444: all] Error 2 [ 487s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 487s] dh_auto_build: make -j1 returned exit code 2 [ 487s] make: *** [debian/rules:6: build] Error 255 [ 487s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 487s] [ 487s] lamb11 failed "build osmo-trx_1.1.1.dsc" at Wed Sep 18 17:40:35 UTC 2019. [ 487s] [ 487s] ### VM INTERACTION START ### [ 490s] [ 470.891508] sysrq: SysRq : Power Off [ 490s] [ 470.899260] reboot: Power down [ 490s] ### VM INTERACTION END ### [ 490s] [ 490s] lamb11 failed "build osmo-trx_1.1.1.dsc" at Wed Sep 18 17:40:38 UTC 2019. [ 490s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Change in ...osmo-trx[master]: radioDevice: Introduce getTxGain() API
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15520 ) Change subject: radioDevice: Introduce getTxGain() API .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15520 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ie3caca8971ed1e5370dfed6fb60716a24e7d82a5 Gerrit-Change-Number: 15520 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 18 Sep 2019 17:39:14 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmocore[master]: tdef_test: verify case where osmo_tdef_set returns -EEXIST
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15563 ) Change subject: tdef_test: verify case where osmo_tdef_set returns -EEXIST .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15563 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I436daa804aac11622fde24afe9ea35193d9e9beb Gerrit-Change-Number: 15563 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 18 Sep 2019 17:30:21 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmocore[master]: tdef: Introduce min_val and max_val fields
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15546 ) Change subject: tdef: Introduce min_val and max_val fields .. Patch Set 3: (2 comments) https://gerrit.osmocom.org/#/c/15546/3/src/vty/tdef_vty.c File src/vty/tdef_vty.c: https://gerrit.osmocom.org/#/c/15546/3/src/vty/tdef_vty.c@188 PS3, Line 188: ULONG_MAX Are you sure it's safe to print this macro? Maybe rather print "INF" as string? Or print min/max values separately? vty_out(vty, ", min %lu", ...); if (t->max_val) vty_out(vty, ", max %lu", ...); https://gerrit.osmocom.org/#/c/15546/3/tests/tdef/tdef_vty_test_config_root.vty File tests/tdef/tdef_vty_test_config_root.vty: https://gerrit.osmocom.org/#/c/15546/3/tests/tdef/tdef_vty_test_config_root.vty@25 PS3, Line 25: 18446744073709551615 This value may be different on some architectures, so this test will fail. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15546 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4661ac41c29a009a1d5fc57d87aaee6041c7d1b2 Gerrit-Change-Number: 15546 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 18 Sep 2019 17:29:39 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-gsm-tester[master]: suite_test: suite requires the fake trial to implement get_run_dir()
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15569
Change subject: suite_test: suite requires the fake trial to implement
get_run_dir()
..
suite_test: suite requires the fake trial to implement get_run_dir()
If class Test calls get_run_dir(), it will generate the run dir from
Suite.get_run_dir() + append, and Suite.get_run_dir() in turn will do
the same with Trial.get_run_dir(). In suite_test.py, however, we are
passing a plain log.Origin object (parent of Trial), which doesn't
implement this function. We need to add it since tests will start using
get_run_dir() to write their own log files.
Generated tmp files are deleted on success and left there on error, in
order to be able to debug stuff easily.
Change-Id: Ic8326659a9ced0351e1e7e57ef21ce36f29a
---
M selftest/suite_test.py
1 file changed, 24 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester
refs/changes/69/15569/1
diff --git a/selftest/suite_test.py b/selftest/suite_test.py
index db19ccc..115d76e 100755
--- a/selftest/suite_test.py
+++ b/selftest/suite_test.py
@@ -1,10 +1,26 @@
#!/usr/bin/env python3
import os
import _prep
-from osmo_gsm_tester import log, suite, config, report
+import shutil
+from osmo_gsm_tester import log, suite, config, report, util
config.ENV_CONF = './suite_test'
+example_trial_dir = os.path.join('test_trial_tmp')
+
+class FakeTrial(log.Origin):
+def __init__(self):
+super().__init__(log.C_TST, 'trial')
+self.dir = util.Dir(example_trial_dir)
+self._run_dir = None
+
+def get_run_dir(self):
+if self._run_dir is not None:
+return self._run_dir
+self._run_dir = util.Dir(self.dir.new_child('test_run'))
+self._run_dir.mkdir()
+return self._run_dir
+
#log.style_change(trace=True)
print('- non-existing suite dir')
@@ -20,7 +36,7 @@
print(config.tostr(s_def.conf))
print('- run hello world test')
-trial = log.Origin(log.C_TST, 'trial')
+trial = FakeTrial()
s = suite.SuiteRun(trial, 'test_suite', s_def)
results = s.run_tests('hello_world.py')
print(report.suite_to_text(s))
@@ -43,7 +59,7 @@
print(output)
print('- test with half empty scenario')
-trial = log.Origin(log.C_TST, 'trial')
+trial = FakeTrial()
scenario = config.Scenario('foo', 'bar')
scenario['resources'] = { 'bts': [{'type': 'osmo-bts-trx'}] }
s = suite.SuiteRun(trial, 'test_suite', s_def, [scenario])
@@ -51,7 +67,7 @@
print(report.suite_to_text(s))
print('- test with scenario')
-trial = log.Origin(log.C_TST, 'trial')
+trial = FakeTrial()
scenario = config.Scenario('foo', 'bar')
scenario['resources'] = { 'bts': [{ 'times': '2', 'type': 'osmo-bts-trx',
'trx_list': [{'nominal_power': '10'}, {'nominal_power': '12'}]}, {'type':
'sysmo'}] }
s = suite.SuiteRun(trial, 'test_suite', s_def, [scenario])
@@ -59,7 +75,7 @@
print(report.suite_to_text(s))
print('- test with scenario and modifiers')
-trial = log.Origin(log.C_TST, 'trial')
+trial = FakeTrial()
scenario = config.Scenario('foo', 'bar')
scenario['resources'] = { 'bts': [{ 'times': '2', 'type': 'osmo-bts-trx',
'trx_list': [{'nominal_power': '10'}, {'nominal_power': '12'}]}, {'type':
'sysmo'}] }
scenario['modifiers'] = { 'bts': [{ 'times': '2', 'trx_list':
[{'nominal_power': '20'}, {'nominal_power': '20'}]}, {'type': 'sysmo'}] }
@@ -70,4 +86,7 @@
print(report.suite_to_text(s))
print('\n- graceful exit.')
+#deleting generated tmp trial dir:
+shutil.rmtree(example_trial_dir, ignore_errors=True)
+
# vim: expandtab tabstop=4 shiftwidth=4
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15569
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: Ic8326659a9ced0351e1e7e57ef21ce36f29a
Gerrit-Change-Number: 15569
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in ...osmocom-bb[master]: host/trxcon: add optional GSMTAP frame logging support
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmocom-bb/+/15568
Change subject: host/trxcon: add optional GSMTAP frame logging support
..
host/trxcon: add optional GSMTAP frame logging support
Change-Id: Iab4128fee5f18d816830fdca6c5ebebaf7451902
---
M src/host/trxcon/sched_lchan_common.c
M src/host/trxcon/sched_lchan_desc.c
M src/host/trxcon/sched_lchan_rach.c
M src/host/trxcon/sched_lchan_xcch.c
M src/host/trxcon/sched_trx.h
M src/host/trxcon/trxcon.c
M src/host/trxcon/trxcon.h
7 files changed, 149 insertions(+), 9 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/68/15568/1
diff --git a/src/host/trxcon/sched_lchan_common.c
b/src/host/trxcon/sched_lchan_common.c
index 615d81c..d8d9ee1 100644
--- a/src/host/trxcon/sched_lchan_common.c
+++ b/src/host/trxcon/sched_lchan_common.c
@@ -2,7 +2,7 @@
* OsmocomBB <-> SDR connection bridge
* TDMA scheduler: common routines for lchan handlers
*
- * (C) 2017 by Vadim Yanitskiy
+ * (C) 2017-2019 by Vadim Yanitskiy
*
* All Rights Reserved
*
@@ -32,15 +32,19 @@
#include
#include
+#include
+#include
#include
#include
+#include
#include "l1ctl_proto.h"
#include "scheduler.h"
#include "sched_trx.h"
#include "logging.h"
+#include "trxcon.h"
#include "trx_if.h"
#include "l1ctl.h"
@@ -80,13 +84,32 @@
},
};
+int sched_gsmtap_send(enum trx_lchan_type lchan_type, uint32_t fn, uint8_t tn,
+ uint16_t band_arfcn, int8_t signal_dbm, uint8_t snr,
+ const uint8_t *data, size_t data_len)
+{
+ const struct trx_lchan_desc *lchan_desc = _lchan_desc[lchan_type];
+
+ /* GSMTAP logging may not be enabled */
+ if (gsmtap == NULL)
+ return 0;
+
+ /* Omit frames with unknown channel type */
+ if (lchan_desc->gsmtap_chan_type == GSMTAP_CHANNEL_UNKNOWN)
+ return 0;
+
+ /* TODO: distinguish GSMTAP_CHANNEL_PCH and GSMTAP_CHANNEL_AGCH */
+ return gsmtap_send(gsmtap, band_arfcn, tn, lchan_desc->gsmtap_chan_type,
+ lchan_desc->ss_nr, fn, signal_dbm, snr, data,
data_len);
+}
+
int sched_send_dt_ind(struct trx_instance *trx, struct trx_ts *ts,
struct trx_lchan_state *lchan, uint8_t *l2, size_t l2_len,
int bit_error_count, bool dec_failed, bool traffic)
{
const struct trx_lchan_desc *lchan_desc;
struct l1ctl_info_dl dl_hdr;
- int dbm_avg;
+ int dbm_avg = 0;
/* Set up pointers */
lchan_desc = _lchan_desc[lchan->type];
@@ -117,6 +140,12 @@
/* Put a packet to higher layers */
l1ctl_tx_dt_ind(trx->l1l, _hdr, l2, l2_len, traffic);
+ /* Optional GSMTAP logging */
+ if (l2_len > 0 && (!traffic || lchan_desc->chan_nr ==
RSL_CHAN_OSMO_PDCH)) {
+ sched_gsmtap_send(lchan->type, lchan->rx_first_fn, ts->index,
+ trx->band_arfcn, dbm_avg, 0, l2, l2_len);
+ }
+
return 0;
}
@@ -140,6 +169,14 @@
l1ctl_tx_dt_conf(trx->l1l, _hdr, traffic);
+ /* Optional GSMTAP logging */
+ if (!traffic || lchan_desc->chan_nr == RSL_CHAN_OSMO_PDCH) {
+ sched_gsmtap_send(lchan->type, fn, ts->index,
+ trx->band_arfcn | ARFCN_UPLINK,
+ 0, 0, lchan->prim->payload,
+ lchan->prim->payload_len);
+ }
+
return 0;
}
diff --git a/src/host/trxcon/sched_lchan_desc.c
b/src/host/trxcon/sched_lchan_desc.c
index 667a88d..a9d89ea 100644
--- a/src/host/trxcon/sched_lchan_desc.c
+++ b/src/host/trxcon/sched_lchan_desc.c
@@ -24,6 +24,8 @@
*/
#include
+#include
+
#include "sched_trx.h"
/* Forward declaration of handlers */
@@ -86,6 +88,7 @@
[TRXC_BCCH] = {
.name = "BCCH", /* 3GPP TS 05.02, section 3.3.2.3 */
.desc = "Broadcast control channel",
+ .gsmtap_chan_type = GSMTAP_CHANNEL_BCCH,
.chan_nr = RSL_CHAN_BCCH,
/* Rx only, xCCH convolutional coding (3GPP TS 05.03, section
4.4),
@@ -98,6 +101,7 @@
[TRXC_RACH] = {
.name = "RACH", /* 3GPP TS 05.02, section 3.3.3.1 */
.desc = "Random access channel",
+ .gsmtap_chan_type = GSMTAP_CHANNEL_RACH,
.chan_nr = RSL_CHAN_RACH,
/* Tx only, RACH convolutional coding (3GPP TS 05.03, section
4.6). */
@@ -107,6 +111,7 @@
[TRXC_CCCH] = {
.name = "CCCH", /* 3GPP TS 05.02, section 3.3.3.1 */
.desc = "Common control channel",
+ .gsmtap_chan_type = GSMTAP_CHANNEL_CCCH,
.chan_nr = RSL_CHAN_PCH_AGCH,
/* Rx only, xCCH convolutional coding (3GPP TS 05.03, section
4.4),
@@ -119,6 +124,7 @@
[TRXC_TCHF] = {
.name = "TCH/F", /* 3GPP TS
Change in ...osmo-gsm-tester[master]: Add a per-test log file
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15567 ) Change subject: Add a per-test log file .. Patch Set 1: Tested manually it works fine with a suite with several tests. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I8cb79c7855e0bc14282d6728841e92ba22699eed Gerrit-Change-Number: 15567 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 18 Sep 2019 15:06:47 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-gsm-tester[master]: Add a per-test log file
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15567
Change subject: Add a per-test log file
..
Add a per-test log file
This way there's no need to go over hours of logging in the main log to
find information of a failing test.
Change-Id: I8cb79c7855e0bc14282d6728841e92ba22699eed
---
M src/osmo_gsm_tester/test.py
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester
refs/changes/67/15567/1
diff --git a/src/osmo_gsm_tester/test.py b/src/osmo_gsm_tester/test.py
index 6f141f1..4d4353a 100644
--- a/src/osmo_gsm_tester/test.py
+++ b/src/osmo_gsm_tester/test.py
@@ -42,6 +42,7 @@
self.duration = 0
self.fail_type = None
self.fail_message = None
+self.log_target = None
def get_run_dir(self):
if self._run_dir is None:
@@ -50,6 +51,7 @@
def run(self):
try:
+self.log_target =
log.FileLogTarget(self.get_run_dir().new_child('log')).set_all_levels(log.L_DBG).style_change(trace=True)
log.large_separator(self.suite_run.trial.name(),
self.suite_run.name(), self.name(), sublevel=3)
self.status = Test.UNKNOWN
self.start_timestamp = time.time()
@@ -81,6 +83,10 @@
# when the program is aborted by a signal (like Ctrl-C), escalate
to abort all.
self.err('TEST RUN ABORTED: %s' % type(e).__name__)
raise
+finally:
+if self.log_target:
+self.log_target.remove()
+self.log_target = None
def name(self):
l = log.get_line_for_src(self.path)
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15567
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I8cb79c7855e0bc14282d6728841e92ba22699eed
Gerrit-Change-Number: 15567
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in ...libosmocore[master]: tdef: Introduce min_val and max_val fields
Hello fixeria, neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/15546 to look at the new patch set (#3). Change subject: tdef: Introduce min_val and max_val fields .. tdef: Introduce min_val and max_val fields This is useful for timers expected to have a range of valid or expected values. Validation is done at runtime when timer values are set by the app or by the user through the VTY. Related: OS#4190 Change-Id: I4661ac41c29a009a1d5fc57d87aaee6041c7d1b2 --- M TODO-RELEASE M include/osmocom/core/tdef.h M src/tdef.c M src/vty/tdef_vty.c M tests/tdef/tdef_test.c M tests/tdef/tdef_test.ok M tests/tdef/tdef_vty_test_config_root.c M tests/tdef/tdef_vty_test_config_root.vty 8 files changed, 139 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/46/15546/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15546 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4661ac41c29a009a1d5fc57d87aaee6041c7d1b2 Gerrit-Change-Number: 15546 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset
Change in ...osmo-trx[master]: radioInterface: Remove unusued getRxGain()
pespin has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-trx/+/15519 )
Change subject: radioInterface: Remove unusued getRxGain()
..
radioInterface: Remove unusued getRxGain()
Only the radioDevice->getRxGain() is called from inside
radioInterfaceMulti, so the API in radioInterface is not used at all.
Change-Id: Icc4e9a7ebfdafe7c72c535752a5e379d12592c9a
---
M Transceiver52M/radioInterface.cpp
M Transceiver52M/radioInterface.h
2 files changed, 0 insertions(+), 8 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
daniel: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/Transceiver52M/radioInterface.cpp
b/Transceiver52M/radioInterface.cpp
index bd19b24..9c7c044 100644
--- a/Transceiver52M/radioInterface.cpp
+++ b/Transceiver52M/radioInterface.cpp
@@ -307,11 +307,6 @@
return mDevice->setRxGain(dB, chan);
}
-double RadioInterface::getRxGain(size_t chan)
-{
- return mDevice->getRxGain(chan);
-}
-
/* Receive a timestamped chunk from the device */
int RadioInterface::pullBuffer()
{
diff --git a/Transceiver52M/radioInterface.h b/Transceiver52M/radioInterface.h
index 235d888..945624a 100644
--- a/Transceiver52M/radioInterface.h
+++ b/Transceiver52M/radioInterface.h
@@ -109,9 +109,6 @@
/** set receive gain */
double setRxGain(double dB, size_t chan = 0);
- /** get receive gain */
- double getRxGain(size_t chan = 0);
-
/** drive transmission of GSM bursts */
void driveTransmitRadio(std::vector ,
std::vector );
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15519
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: Icc4e9a7ebfdafe7c72c535752a5e379d12592c9a
Gerrit-Change-Number: 15519
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...libosmocore[master]: logging: Introduce mutex API to manage log_target in multi-thread envs
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/15560 to look at the new patch set (#5). Change subject: logging: Introduce mutex API to manage log_target in multi-thread envs .. logging: Introduce mutex API to manage log_target in multi-thread envs log_enable_multithread() enables use of locks inside the implementation. Lock use is disabled by default, this way only multi-thread processes need to enable it and suffer related complexity/performance penalties. Locks are required around osmo_log_target_list and items inside it, since targets can be used, modified and deleted by different threads concurrently (for instance, user writing "logging disable" in VTY while another thread is willing to write into that target). Multithread apps and libraries aiming at being used in multithread apps should update their code to use the locks introduced here when containing code iterating over osmo_log_target_list explictly or implicitly by obtaining a log_target (eg. osmo_log_vty2tgt()). Related: OS#4088 Change-Id: Id7711893b34263baacac6caf4d489467053131bb --- M include/osmocom/core/logging.h M src/gb/gprs_bssgp_vty.c M src/gb/gprs_ns_vty.c M src/logging.c M src/vty/logging_vty.c M tests/logging/logging_vty_test.c 6 files changed, 213 insertions(+), 93 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/60/15560/5 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id7711893b34263baacac6caf4d489467053131bb Gerrit-Change-Number: 15560 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-MessageType: newpatchset
Change in ...libosmocore[master]: logging: Introduce mutex API to manage log_target in multi-thread envs
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/15560 to look at the new patch set (#4). Change subject: logging: Introduce mutex API to manage log_target in multi-thread envs .. logging: Introduce mutex API to manage log_target in multi-thread envs log_enable_multithread() enables use of locks inside the implementation. Lock use is disabled by default, this way only multi-thread processes need to enable it and suffer related complexity/performance penalties. Locks are required around osmo_log_target_list and items inside it, since targets can be used, modified and deleted by different threads concurrently (for instance, user writing "logging disable" in VTY while another thread is willing to write into that target). Multithread apps and libraries aiming at being used in multithread apps should update their code to use the locks introduced here when containing code iterating over osmo_log_target_list explictly or implicitly by obtaining a log_target (eg. osmo_log_vty2tgt()). Related: OS#4088 Change-Id: Id7711893b34263baacac6caf4d489467053131bb --- M include/osmocom/core/logging.h M src/gb/gprs_bssgp_vty.c M src/gb/gprs_ns_vty.c M src/logging.c M src/vty/logging_vty.c M tests/logging/logging_vty_test.c 6 files changed, 213 insertions(+), 93 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/60/15560/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id7711893b34263baacac6caf4d489467053131bb Gerrit-Change-Number: 15560 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-MessageType: newpatchset
Change in ...osmo-ci[master]: gerrit, master builds: concurrent OsmoPCU builds
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ci/+/15566
Change subject: gerrit, master builds: concurrent OsmoPCU builds
..
gerrit, master builds: concurrent OsmoPCU builds
Re-enable concurrent builds for OsmoPCU, and run all builds in
docker. This should prevent previous problems with VTY/CTRL test
collisions, which lead to the concurrent builds being disabled
in I23d5b75825a667e4f043d16a12b841cd8f01af5e.
Related: OS#4204
Change-Id: I4f90a601e41dca18a6fcbab56bdf5663167d2353
---
M jobs/gerrit-verifications.yml
M jobs/master-builds.yml
2 files changed, 32 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/66/15566/1
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index abd8090..c5aae68 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -200,7 +200,7 @@
a3: !!python/tuple [sysmo, lc15, oc2g, none]
a4_name: WITH_MANUALS
a4: !!python/tuple ["1", "0"]
- sequential: true
+ concurrent: true
combination_filter: >
(with_vty == "True" && with_dsp == "sysmo" &&
FIRMWARE_VERSION=="master" && WITH_MANUALS == "0") ||
(with_vty == "True" && with_dsp == "lc15" &&
FIRMWARE_VERSION=="master" && WITH_MANUALS == "0") ||
@@ -208,6 +208,20 @@
(with_vty == "True" && with_dsp == "lc15" &&
FIRMWARE_VERSION=="litecell15" && WITH_MANUALS == "0") ||
(with_vty == "True" && with_dsp == "oc2g" &&
FIRMWARE_VERSION=="oc2g" && WITH_MANUALS == "0") ||
(with_vty == "False" && with_dsp == "none" &&
FIRMWARE_VERSION=="master" && WITH_MANUALS == "1")
+ cmd: |
+docker run --rm=true \
+ -e HOME=/build \
+ -e MAKE=make \
+ -e PARALLEL_MAKE="$PARALLEL_MAKE" \
+ -e FIRMWARE_VERSION="$FIRMWARE_VERSION" \
+ -e with_vty="$with_vty" \
+ -e with_dsp="$with_dsp" \
+ -e WITH_MANUALS="$WITH_MANUALS" \
+ -e PATH="$PATH:/build_bin" \
+ -w /build -i -u build \
+ -v "$PWD:/build" \
+ -v "$HOME/bin:/build_bin" \
+ osmocom:amd64 /build/contrib/jenkins.sh
- osmo-python-tests:
repos_url: 'ssh://jenk...@gerrit.osmocom.org:29418/python/{repos}'
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index ed180a4..9358d82 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -302,14 +302,29 @@
a3: !!python/tuple [sysmo, lc15, none]
a4_name: WITH_MANUALS
a4: !!python/tuple ["1", "0"]
- sequential: true
+ concurrent: true
combination_filter: >
(with_vty == "True" && with_dsp == "sysmo" &&
FIRMWARE_VERSION=="master" && WITH_MANUALS == "0") ||
(with_vty == "True" && with_dsp == "lc15" &&
FIRMWARE_VERSION=="master" && WITH_MANUALS == "0") ||
(with_vty == "True" && with_dsp == "lc15" &&
FIRMWARE_VERSION=="v2017.01" && WITH_MANUALS == "0") ||
(with_vty == "True" && with_dsp == "lc15" &&
FIRMWARE_VERSION=="origin/nrw/litecell15" && WITH_MANUALS == "0") ||
(with_vty == "False" && with_dsp == "none" &&
FIRMWARE_VERSION=="master" && WITH_MANUALS == "1")
- cmd: PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
+ cmd: |
+docker run --rm=true \
+ -e HOME=/build \
+ -e MAKE=make \
+ -e PARALLEL_MAKE="$PARALLEL_MAKE" \
+ -e FIRMWARE_VERSION="$FIRMWARE_VERSION" \
+ -e with_vty="$with_vty" \
+ -e with_dsp="$with_dsp" \
+ -e WITH_MANUALS="$WITH_MANUALS" \
+ -e PATH="$PATH:/build_bin" \
+ -e PUBLISH="1" \
+ -e ASCIIDOC_WARNINGS_CHECK="1" \
+ -w /build -i -u build \
+ -v "$PWD:/build" \
+ -v "$HOME/bin:/build_bin" \
+ osmocom:amd64 /build/contrib/jenkins.sh
- osmo-sgsn:
a1_name: IU
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15566
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I4f90a601e41dca18a6fcbab56bdf5663167d2353
Gerrit-Change-Number: 15566
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-MessageType: newchange
Change in ...osmo-trx[master]: radioInterfaceMulti: Override setTxGain() to avoid chan!=0 calls
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-trx/+/15521 )
Change subject: radioInterfaceMulti: Override setTxGain() to avoid chan!=0 calls
..
Patch Set 1:
> Patch Set 1:
>
> I don't know how the inheritance looks like, but aren't you actually adding
> the setTxGain() method to both RadioInterface and *Multi?
>
> So you're overriding the RadioDevice setTxGain method in
> RadioInterface(Multi)?
radioInterface class is the base and usual radio interface class (and it's not
abstract, it's instantiable since it's the "simple usual" one). Then, there are
2 child class extending and overriding some parts of the radioInterface base
class:
-radioInterfaceResamp
-radioInterfaceMult
radioInterface{,Resamp,Mult} interact with its mDevice (radioDevice), which is
an abstract class extended by LMSDevice, UHDDevice, USRPDevice.
In this commit I'm overriding radioInterface::setTxGain() in radioInterfaceMult
to avoid calling radioDevice::setTxGain() on chans != 0 since it doesn't make
sense to do so, because radioInterfaceMult is used when logical channels are
multiplexed in one SDR physical channel, so in that scenario the radioDevice is
going to be expecting to manage 1 physical channel.
This way we simplify the logic of each radioDevice implementation and keep it
as much as possible inside radioInterfaceMult, responsible of muxing the
multiple channels into one.
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15521
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I7e67f660c3b0b009db59b405de603f6058021802
Gerrit-Change-Number: 15521
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-Comment-Date: Wed, 18 Sep 2019 13:59:37 +
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Change in ...osmo-pcu[master]: tests/app_info: fix compiling with older g++
osmith has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-pcu/+/15564 )
Change subject: tests/app_info: fix compiling with older g++
..
tests/app_info: fix compiling with older g++
Do not use C++11 extended initializers to prevent the following error.
AppInfoTest.cpp:109:54: error: extended initializer lists only available with
-std=c++11 or -std=gnu++11
pcu_prim.u.app_info_req = {0, 15, {0xff, 0x00, 0xff}};
I ran into this when modifying the gerrit build verification job to
build with docker (which still uses GCC-4.9).
Related: OS#4204
Change-Id: I307cd87af88e86804a90d6466e9cc3909bfe701f
---
M tests/app_info/AppInfoTest.cpp
1 file changed, 17 insertions(+), 13 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/tests/app_info/AppInfoTest.cpp b/tests/app_info/AppInfoTest.cpp
index c4cf548..ca2c59e 100644
--- a/tests/app_info/AppInfoTest.cpp
+++ b/tests/app_info/AppInfoTest.cpp
@@ -47,14 +47,14 @@
fprintf(stderr, "\n");
}
-void test_enc() {
- struct gsm_pcu_if_app_info_req req = {0, 15, {0xff, 0x00, 0xff}};
+void test_enc(const struct gsm_pcu_if_app_info_req *req)
+{
const char *exp = "03 fc 03 fc 00 00 00 00 00 00 00 00 00 00 00 00 ";
/* shifted by two bits to the right */
struct msgb *msg;
char *msg_dump;
fprintf(stderr, "--- %s ---\n", __func__);
- msg = gprs_rlcmac_app_info_msg();
+ msg = gprs_rlcmac_app_info_msg(req);
msg_dump = msgb_hexdump_c(tall_pcu_ctx, msg);
fprintf(stderr, "exp: %s\n", exp);
@@ -100,13 +100,13 @@
fprintf(stderr, "\n");
}
-void test_sched_app_info_ok()
+void test_sched_app_info_ok(const struct gsm_pcu_if_app_info_req *req)
{
struct gsm_pcu_if pcu_prim = {PCU_IF_MSG_APP_INFO_REQ, };
struct msgb *msg;
fprintf(stderr, "--- %s ---\n", __func__);
- pcu_prim.u.app_info_req = {0, 15, {0xff, 0x00, 0xff}};
+ pcu_prim.u.app_info_req = *req;
pcu_rx(PCU_IF_MSG_APP_INFO_REQ, _prim);
msg = sched_app_info(tbf1);
@@ -120,13 +120,13 @@
fprintf(stderr, "\n");
}
-void test_sched_app_info_missing_app_info_in_bts()
+void test_sched_app_info_missing_app_info_in_bts(const struct
gsm_pcu_if_app_info_req *req)
{
struct gprs_rlcmac_bts *bts_data = BTS::main_bts()->bts_data();
struct gsm_pcu_if pcu_prim = {PCU_IF_MSG_APP_INFO_REQ, };
fprintf(stderr, "--- %s ---\n", __func__);
- pcu_prim.u.app_info_req = {0, 15, {0xff, 0x00, 0xff}};
+ pcu_prim.u.app_info_req = *req;
pcu_rx(PCU_IF_MSG_APP_INFO_REQ, _prim);
msgb_free(bts_data->app_info);
@@ -137,12 +137,12 @@
fprintf(stderr, "\n");
}
-void test_pcu_rx_overwrite_app_info()
+void test_pcu_rx_overwrite_app_info(const struct gsm_pcu_if_app_info_req *req)
{
struct gsm_pcu_if pcu_prim = {PCU_IF_MSG_APP_INFO_REQ, };
fprintf(stderr, "--- %s ---\n", __func__);
- pcu_prim.u.app_info_req = {0, 15, {0xff, 0x00, 0xff}};
+ pcu_prim.u.app_info_req = *req;
pcu_rx(PCU_IF_MSG_APP_INFO_REQ, _prim);
pcu_rx(PCU_IF_MSG_APP_INFO_REQ, _prim);
fprintf(stderr, "\n");
@@ -162,6 +162,10 @@
int main(int argc, char *argv[])
{
+ struct gsm_pcu_if_app_info_req req = {0, 15, {0}};
+ const uint8_t req_data[] = {0xff, 0x00, 0xff};
+ memcpy(req.data, req_data, 3);
+
tall_pcu_ctx = talloc_named_const(NULL, 1, "AppInfoTest");
osmo_init_logging2(tall_pcu_ctx, _log_info);
log_set_use_color(osmo_stderr_target, 0);
@@ -169,13 +173,13 @@
log_parse_category_mask(osmo_stderr_target,
"DL1IF,1:DRLCMAC,3:DRLCMACSCHED,1");
test_enc_zero_len();
- test_enc();
+ test_enc();
test_pcu_rx_no_subscr_with_active_tbf();
prepare_bts_with_two_dl_tbf_subscr();
- test_sched_app_info_ok();
- test_sched_app_info_missing_app_info_in_bts();
- test_pcu_rx_overwrite_app_info();
+ test_sched_app_info_ok();
+ test_sched_app_info_missing_app_info_in_bts();
+ test_pcu_rx_overwrite_app_info();
cleanup();
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15564
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I307cd87af88e86804a90d6466e9cc3909bfe701f
Gerrit-Change-Number: 15564
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...osmo-trx[master]: radioInterface: Remove unusued getRxGain()
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15519 ) Change subject: radioInterface: Remove unusued getRxGain() .. Patch Set 1: Code-Review+2 To simplify code. If it's not used, it's not needed in there :) +1+1=+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15519 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Icc4e9a7ebfdafe7c72c535752a5e379d12592c9a Gerrit-Change-Number: 15519 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 18 Sep 2019 13:53:22 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-pcu[master]: configure.ac: set C and C++ dialects
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15565 ) Change subject: configure.ac: set C and C++ dialects .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15565 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia57ba101627e3cc0babeca82631e207a3e2e0960 Gerrit-Change-Number: 15565 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 18 Sep 2019 13:52:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-pcu[master]: tests/app_info: fix compiling with older g++
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15564 ) Change subject: tests/app_info: fix compiling with older g++ .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15564 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I307cd87af88e86804a90d6466e9cc3909bfe701f Gerrit-Change-Number: 15564 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 18 Sep 2019 13:49:44 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmocore[master]: logging: Introduce mutex API to manage log_target in multi-thread envs
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15560 ) Change subject: logging: Introduce mutex API to manage log_target in multi-thread envs .. Patch Set 3: (1 comment) I hope this isn't annoying you -- but... https://gerrit.osmocom.org/#/c/15560/2/include/osmocom/core/logging.h File include/osmocom/core/logging.h: https://gerrit.osmocom.org/#/c/15560/2/include/osmocom/core/logging.h@392 PS2, Line 392: void log_tgt_mutex_unlock(void); > Same as explained above. […] I understand. Yet, even easier would be without recompile. Evaluating a bool is not a performance penalty. In an environment like a sysmoBTS, or maybe even just if users installed deb packages and are working on that, it can be really cumbersome to have to recompile libosmocore (and everything else) just to switch on debugging. We have similar debugging bools, see for example osmo_fsm_log_addr(). No reply on the use of different kinds of symbols? I know you can do better ;) Not sure if it's worth spending time and discussing, but I believe my two points are valid... -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id7711893b34263baacac6caf4d489467053131bb Gerrit-Change-Number: 15560 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Wed, 18 Sep 2019 13:48:57 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: neels Gerrit-MessageType: comment
Change in ...osmo-bts[master]: log: set L1 SAPI context
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15539 ) Change subject: log: set L1 SAPI context .. Patch Set 4: > I still don't get why this has any mention of PCU in it. Well, I'm reading out the L1 SAPI from the "struct gsm_pcu_if", so I can set the L1 SAPI log context for all incoming and outgoing L1 messages from BTS<-->PCU. > the L1 SAPI value can have many other values that have nothing to do with the > PCU. Sorry, I had assumed, that in OsmoBTS, this L1 SAPI logging would only be relevant for the BTS<-->PCU socket, and therefore thought the appropriate log context would be what is defined with PCU_IF_SAPI_*. >From what I understand now, instead I need to do this: * create a new enum in libosmocore that holds all kinds of L1 SAPI values * don't use "pcu_prim->...sapi" directly to set the filter context, but translate it to the enum first * set the log context in other places in OSmoBTS, that are not related to the PCU (that must be the other side, when talking to hardware backends) Is this correct? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15539 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6b7bb2e1d61502b61214f854a4ec5cbb7267545b Gerrit-Change-Number: 15539 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 18 Sep 2019 13:36:32 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-msc[master]: fix error on BSSMAP Cipher Mode Complete L3 msg IE
neels has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-msc/+/15317 )
Change subject: fix error on BSSMAP Cipher Mode Complete L3 msg IE
..
fix error on BSSMAP Cipher Mode Complete L3 msg IE
When an MS returns the IMEISV in the BSSMAP Cipher Mode Complete message in
the Layer 3 Message Contents IE, do not re-invoke the decode_cb() a second
time, but instead point to it from the ran_msg.cipher_mode_complete struct.
When the MSC-A decodes the Ciphering Mode Complete message, it always wants to
also decode the enclosed DTAP from the Layer 3 Message Contents IE. However,
when the MSC-I preliminarily decodes messages, it often just wants to identify
specific messages without fully acting on them, let alone dispatching RAN_UP_L2
events more than once. So leave it up to the supplied decode_cb passed to
ran_dec_l2() implementations to decide whether to decode the DTAP.
In msc_a.c hence evaluate the DTAP by passing a msgb to msc_a_up_l3(), which
will evaluate the RR Ciphering Mode Complete message found in the BSSMAP Cipher
Mode Complete's Layer 3 Message Contents IE.
Particularly, the previous choice of calling the decode_cb a second time for
the enclosed DTAP caused a header/length parsing error: the second decode_cb
call tried to mimick DTAP by overwriting the l3h pointer and truncating the
length of the msgb, but subsequently ran_a_decode_l2() would again derive the
l3h from the l2h, obliterating the intended re-interpretation as DTAP, and
hence the previous truncation caused error messages on each and every Cipher
Mode Complete message, like:
DBSSAP ERROR libmsc/ran_msg_a.c:764
msc_a(IMSI-26242340300:MSISDN-:TMSI-0xA73E055A:GERAN-A-77923:LU)[0x5563947521e0]{MSC_A_ST_AUTH_CIPH}:
RAN decode: BSSMAP: BSSMAP data truncated, discarding message
This error was seen a lot at CCCamp2019.
Modifying the msgb was a bad idea to begin with, the approach taken in this
patch is much cleaner.
Note that apparently many phones include the IMEISV in the Cipher Mode Complete
message even though the BSSMAP Cipher Mode Command did not include the Cipher
Response Mode IE. So, even though we did not specifically ask for the Cipher
Mode Complete to include any identity, many MS default to including the IMEISV
of their own accord. Reproduce: attach to osmo-msc with ciphering enabled using
a Samsung Galaxy S4mini.
Related: OS#4168
Change-Id: Icd8dad18d6dda24d075dd8da72c3d6db1302090d
---
M include/osmocom/msc/ran_msg.h
M src/libmsc/msc_a.c
M src/libmsc/ran_msg_a.c
3 files changed, 16 insertions(+), 11 deletions(-)
Approvals:
Jenkins Builder: Verified
diff --git a/include/osmocom/msc/ran_msg.h b/include/osmocom/msc/ran_msg.h
index af0822b..081c7ad 100644
--- a/include/osmocom/msc/ran_msg.h
+++ b/include/osmocom/msc/ran_msg.h
@@ -210,6 +210,7 @@
* alg_id == 0 means no such IE was present. */
uint8_t alg_id;
const char *imeisv;
+ const struct tlv_p_entry *l3_msg;
} cipher_mode_complete;
struct {
enum gsm0808_cause bssap_cause;
diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c
index b414574..344b442 100644
--- a/src/libmsc/msc_a.c
+++ b/src/libmsc/msc_a.c
@@ -1407,6 +1407,18 @@
};
vlr_subscr_rx_ciph_res(vsub, VLR_CIPH_COMPL);
rc = 0;
+
+ /* Evaluate enclosed L3 message, typically Identity Response
(IMEISV) */
+ if (msg->cipher_mode_complete.l3_msg) {
+ unsigned char *data = (unsigned
char*)(msg->cipher_mode_complete.l3_msg->val);
+ uint16_t len = msg->cipher_mode_complete.l3_msg->len;
+ struct msgb *dtap = msgb_alloc(len, "DTAP from Cipher
Mode Complete");
+ unsigned char *pos = msgb_put(dtap, len);
+ memcpy(pos, data, len);
+ dtap->l3h = pos;
+ rc = msc_a_up_l3(msc_a, dtap);
+ msgb_free(dtap);
+ }
break;
case RAN_MSG_CIPHER_MODE_REJECT:
diff --git a/src/libmsc/ran_msg_a.c b/src/libmsc/ran_msg_a.c
index 43e27f6..7672d86 100644
--- a/src/libmsc/ran_msg_a.c
+++ b/src/libmsc/ran_msg_a.c
@@ -194,18 +194,10 @@
ran_dec_msg.cipher_mode_complete.alg_id =
ie_chosen_encr_alg->val[0];
}
- rc = ran_decoded(ran_dec, _dec_msg);
+ if (ie_l3_msg)
+ ran_dec_msg.cipher_mode_complete.l3_msg = ie_l3_msg;
- if (ie_l3_msg) {
- msg->l3h = (uint8_t*)ie_l3_msg->val;
- msgb_l3trim(msg, ie_l3_msg->len);
- ran_dec_msg = (struct ran_msg){
- .msg_type = RAN_MSG_DTAP,
- .msg_name = "BSSMAP Ciphering Mode Complete (L3 Message
Contents)",
-
Change in ...osmo-msc[master]: fix error on BSSMAP Cipher Mode Complete L3 msg IE
Hello fixeria, laforge, Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-msc/+/15317
to look at the new patch set (#8).
Change subject: fix error on BSSMAP Cipher Mode Complete L3 msg IE
..
fix error on BSSMAP Cipher Mode Complete L3 msg IE
When an MS returns the IMEISV in the BSSMAP Cipher Mode Complete message in
the Layer 3 Message Contents IE, do not re-invoke the decode_cb() a second
time, but instead point to it from the ran_msg.cipher_mode_complete struct.
When the MSC-A decodes the Ciphering Mode Complete message, it always wants to
also decode the enclosed DTAP from the Layer 3 Message Contents IE. However,
when the MSC-I preliminarily decodes messages, it often just wants to identify
specific messages without fully acting on them, let alone dispatching RAN_UP_L2
events more than once. So leave it up to the supplied decode_cb passed to
ran_dec_l2() implementations to decide whether to decode the DTAP.
In msc_a.c hence evaluate the DTAP by passing a msgb to msc_a_up_l3(), which
will evaluate the RR Ciphering Mode Complete message found in the BSSMAP Cipher
Mode Complete's Layer 3 Message Contents IE.
Particularly, the previous choice of calling the decode_cb a second time for
the enclosed DTAP caused a header/length parsing error: the second decode_cb
call tried to mimick DTAP by overwriting the l3h pointer and truncating the
length of the msgb, but subsequently ran_a_decode_l2() would again derive the
l3h from the l2h, obliterating the intended re-interpretation as DTAP, and
hence the previous truncation caused error messages on each and every Cipher
Mode Complete message, like:
DBSSAP ERROR libmsc/ran_msg_a.c:764
msc_a(IMSI-26242340300:MSISDN-:TMSI-0xA73E055A:GERAN-A-77923:LU)[0x5563947521e0]{MSC_A_ST_AUTH_CIPH}:
RAN decode: BSSMAP: BSSMAP data truncated, discarding message
This error was seen a lot at CCCamp2019.
Modifying the msgb was a bad idea to begin with, the approach taken in this
patch is much cleaner.
Note that apparently many phones include the IMEISV in the Cipher Mode Complete
message even though the BSSMAP Cipher Mode Command did not include the Cipher
Response Mode IE. So, even though we did not specifically ask for the Cipher
Mode Complete to include any identity, many MS default to including the IMEISV
of their own accord. Reproduce: attach to osmo-msc with ciphering enabled using
a Samsung Galaxy S4mini.
Related: OS#4168
Change-Id: Icd8dad18d6dda24d075dd8da72c3d6db1302090d
---
M include/osmocom/msc/ran_msg.h
M src/libmsc/msc_a.c
M src/libmsc/ran_msg_a.c
3 files changed, 16 insertions(+), 11 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/17/15317/8
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15317
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: Icd8dad18d6dda24d075dd8da72c3d6db1302090d
Gerrit-Change-Number: 15317
Gerrit-PatchSet: 8
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: neels
Gerrit-MessageType: newpatchset
Change in ...osmo-trx[master]: radioInterfaceMulti: Override setTxGain() to avoid chan!=0 calls
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15521 ) Change subject: radioInterfaceMulti: Override setTxGain() to avoid chan!=0 calls .. Patch Set 1: I don't know how the inheritance looks like, but aren't you actually adding the setTxGain() method to both RadioInterface and *Multi? So you're overriding the RadioDevice setTxGain method in RadioInterface(Multi)? -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I7e67f660c3b0b009db59b405de603f6058021802 Gerrit-Change-Number: 15521 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 18 Sep 2019 13:21:13 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-trx[master]: radioDevice: Introduce getTxGain() API
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15520 ) Change subject: radioDevice: Introduce getTxGain() API .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15520 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ie3caca8971ed1e5370dfed6fb60716a24e7d82a5 Gerrit-Change-Number: 15520 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 18 Sep 2019 13:19:24 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-trx[master]: radioInterface: Mark setRxGain as virtual
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15541 ) Change subject: radioInterface: Mark setRxGain as virtual .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15541 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ie41efab1e60b88677bbd1ec333ea656794503a5a Gerrit-Change-Number: 15541 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 18 Sep 2019 13:17:23 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-trx[master]: radioInterface: Remove unusued getRxGain()
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15519 ) Change subject: radioInterface: Remove unusued getRxGain() .. Patch Set 1: Code-Review+1 I don't know why you want to remove it, but the changes look good. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15519 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Icc4e9a7ebfdafe7c72c535752a5e379d12592c9a Gerrit-Change-Number: 15519 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 18 Sep 2019 13:10:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-pcu[master]: configure.ac: set C and C++ dialects
osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-pcu/+/15565 ) Change subject: configure.ac: set C and C++ dialects .. configure.ac: set C and C++ dialects Make sure that the compiler always assumes the same C dialect, to prevent unexpected compiler errors when building with older compilers (on other Linux distrubtions like in OBS, or in docker). Use gnu89 and gnu++03, because that is what the code currently compiles with. Related: https://lists.osmocom.org/pipermail/openbsc/2019-September/013030.html Related: OS#3598 Change-Id: Ia57ba101627e3cc0babeca82631e207a3e2e0960 --- M configure.ac 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/65/15565/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15565 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia57ba101627e3cc0babeca82631e207a3e2e0960 Gerrit-Change-Number: 15565 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-MessageType: newpatchset
Change in ...osmo-pcu[master]: configure.ac: set C and C++ dialects
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15565 Change subject: configure.ac: set C and C++ dialects .. configure.ac: set C and C++ dialects Make sure that the compiler always assumes the same C dialect, to prevent unexpected compiler errors when building with older compilers (on other Linux distrubtions like in OBS, or in docker). Use gnu89 and gnu++03, because that is what the code currently compiles with. Related: OS#3598 Change-Id: Ia57ba101627e3cc0babeca82631e207a3e2e0960 --- M configure.ac 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/65/15565/1 diff --git a/configure.ac b/configure.ac index 5ecd133..2f29047 100644 --- a/configure.ac +++ b/configure.ac @@ -9,6 +9,9 @@ AM_INIT_AUTOMAKE([dist-bzip2]) AC_CONFIG_TESTDIR(tests) +CXXFLAGS="$CXXFLAGS -std=gnu++03" +CFLAGS="$CFLAGS -std=gnu89" + dnl kernel style compile messages m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15565 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia57ba101627e3cc0babeca82631e207a3e2e0960 Gerrit-Change-Number: 15565 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
Change in ...osmo-pcu[master]: tests/app_info: fix compiling with older g++
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-pcu/+/15564
Change subject: tests/app_info: fix compiling with older g++
..
tests/app_info: fix compiling with older g++
Do not use C++11 extended initializers to prevent the following error.
AppInfoTest.cpp:109:54: error: extended initializer lists only available with
-std=c++11 or -std=gnu++11
pcu_prim.u.app_info_req = {0, 15, {0xff, 0x00, 0xff}};
I ran into this when modifying the gerrit build verification job to
build with docker (which still uses GCC-4.9).
Related: OS#4204
Change-Id: I307cd87af88e86804a90d6466e9cc3909bfe701f
---
M tests/app_info/AppInfoTest.cpp
1 file changed, 17 insertions(+), 13 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/64/15564/1
diff --git a/tests/app_info/AppInfoTest.cpp b/tests/app_info/AppInfoTest.cpp
index c4cf548..ca2c59e 100644
--- a/tests/app_info/AppInfoTest.cpp
+++ b/tests/app_info/AppInfoTest.cpp
@@ -47,14 +47,14 @@
fprintf(stderr, "\n");
}
-void test_enc() {
- struct gsm_pcu_if_app_info_req req = {0, 15, {0xff, 0x00, 0xff}};
+void test_enc(const struct gsm_pcu_if_app_info_req *req)
+{
const char *exp = "03 fc 03 fc 00 00 00 00 00 00 00 00 00 00 00 00 ";
/* shifted by two bits to the right */
struct msgb *msg;
char *msg_dump;
fprintf(stderr, "--- %s ---\n", __func__);
- msg = gprs_rlcmac_app_info_msg();
+ msg = gprs_rlcmac_app_info_msg(req);
msg_dump = msgb_hexdump_c(tall_pcu_ctx, msg);
fprintf(stderr, "exp: %s\n", exp);
@@ -100,13 +100,13 @@
fprintf(stderr, "\n");
}
-void test_sched_app_info_ok()
+void test_sched_app_info_ok(const struct gsm_pcu_if_app_info_req *req)
{
struct gsm_pcu_if pcu_prim = {PCU_IF_MSG_APP_INFO_REQ, };
struct msgb *msg;
fprintf(stderr, "--- %s ---\n", __func__);
- pcu_prim.u.app_info_req = {0, 15, {0xff, 0x00, 0xff}};
+ pcu_prim.u.app_info_req = *req;
pcu_rx(PCU_IF_MSG_APP_INFO_REQ, _prim);
msg = sched_app_info(tbf1);
@@ -120,13 +120,13 @@
fprintf(stderr, "\n");
}
-void test_sched_app_info_missing_app_info_in_bts()
+void test_sched_app_info_missing_app_info_in_bts(const struct
gsm_pcu_if_app_info_req *req)
{
struct gprs_rlcmac_bts *bts_data = BTS::main_bts()->bts_data();
struct gsm_pcu_if pcu_prim = {PCU_IF_MSG_APP_INFO_REQ, };
fprintf(stderr, "--- %s ---\n", __func__);
- pcu_prim.u.app_info_req = {0, 15, {0xff, 0x00, 0xff}};
+ pcu_prim.u.app_info_req = *req;
pcu_rx(PCU_IF_MSG_APP_INFO_REQ, _prim);
msgb_free(bts_data->app_info);
@@ -137,12 +137,12 @@
fprintf(stderr, "\n");
}
-void test_pcu_rx_overwrite_app_info()
+void test_pcu_rx_overwrite_app_info(const struct gsm_pcu_if_app_info_req *req)
{
struct gsm_pcu_if pcu_prim = {PCU_IF_MSG_APP_INFO_REQ, };
fprintf(stderr, "--- %s ---\n", __func__);
- pcu_prim.u.app_info_req = {0, 15, {0xff, 0x00, 0xff}};
+ pcu_prim.u.app_info_req = *req;
pcu_rx(PCU_IF_MSG_APP_INFO_REQ, _prim);
pcu_rx(PCU_IF_MSG_APP_INFO_REQ, _prim);
fprintf(stderr, "\n");
@@ -162,6 +162,10 @@
int main(int argc, char *argv[])
{
+ struct gsm_pcu_if_app_info_req req = {0, 15, {0}};
+ const uint8_t req_data[] = {0xff, 0x00, 0xff};
+ memcpy(req.data, req_data, 3);
+
tall_pcu_ctx = talloc_named_const(NULL, 1, "AppInfoTest");
osmo_init_logging2(tall_pcu_ctx, _log_info);
log_set_use_color(osmo_stderr_target, 0);
@@ -169,13 +173,13 @@
log_parse_category_mask(osmo_stderr_target,
"DL1IF,1:DRLCMAC,3:DRLCMACSCHED,1");
test_enc_zero_len();
- test_enc();
+ test_enc();
test_pcu_rx_no_subscr_with_active_tbf();
prepare_bts_with_two_dl_tbf_subscr();
- test_sched_app_info_ok();
- test_sched_app_info_missing_app_info_in_bts();
- test_pcu_rx_overwrite_app_info();
+ test_sched_app_info_ok();
+ test_sched_app_info_missing_app_info_in_bts();
+ test_pcu_rx_overwrite_app_info();
cleanup();
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15564
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I307cd87af88e86804a90d6466e9cc3909bfe701f
Gerrit-Change-Number: 15564
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-MessageType: newchange
Change in ...osmo-bts[master]: log: set L1 SAPI context
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15539 ) Change subject: log: set L1 SAPI context .. Patch Set 4: I still don't get why this has any mention of PCU in it. the L1 SAPI value can have many other values that have nothing to do with the PCU. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15539 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6b7bb2e1d61502b61214f854a4ec5cbb7267545b Gerrit-Change-Number: 15539 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 18 Sep 2019 12:21:27 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-bts[master]: osmo-bts-trx/scheduler: fix: check rc of osmo_ecu_frame_out()
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-bts/+/15489 )
Change subject: osmo-bts-trx/scheduler: fix: check rc of osmo_ecu_frame_out()
..
osmo-bts-trx/scheduler: fix: check rc of osmo_ecu_frame_out()
Change-Id: I32d244f5ddef46c8b8719f5ec27b7456514d407a
Fixes: CID#204005 (CID#204007), CID#204006 (CID#204004)
---
M src/osmo-bts-trx/scheduler_trx.c
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c
index 45fc701..8b0c761 100644
--- a/src/osmo-bts-trx/scheduler_trx.c
+++ b/src/osmo-bts-trx/scheduler_trx.c
@@ -1272,7 +1272,8 @@
/* If there is an ECU active on this channel, use its
output */
if (lchan->ecu_state) {
rc = osmo_ecu_frame_out(lchan->ecu_state,
tch_data);
- goto compose_l1sap;
+ if (rc >= 0) /* Otherwise we send a BFI */
+ goto compose_l1sap;
}
switch (tch_mode) {
@@ -1485,7 +1486,8 @@
/* If there is an ECU active on this channel, use its
output */
if (lchan->ecu_state) {
rc = osmo_ecu_frame_out(lchan->ecu_state,
tch_data);
- goto compose_l1sap;
+ if (rc >= 0) /* Otherwise we send a BFI */
+ goto compose_l1sap;
}
switch (tch_mode) {
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15489
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I32d244f5ddef46c8b8719f5ec27b7456514d407a
Gerrit-Change-Number: 15489
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...osmo-bts[master]: osmo-bts-trx/scheduler: fix: check rc of osmo_ecu_frame_out()
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15489 ) Change subject: osmo-bts-trx/scheduler: fix: check rc of osmo_ecu_frame_out() .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I32d244f5ddef46c8b8719f5ec27b7456514d407a Gerrit-Change-Number: 15489 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 18 Sep 2019 12:19:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmocore[master]: tdef: Introduce min_val and max_val fields
Hello fixeria, neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/15546 to look at the new patch set (#2). Change subject: tdef: Introduce min_val and max_val fields .. tdef: Introduce min_val and max_val fields This is useful for timers expected to have a range of valid or expected values. Validation is done at runtime when timer values are set by the app or by the user through the VTY. Related: OS#4190 Change-Id: I4661ac41c29a009a1d5fc57d87aaee6041c7d1b2 --- M include/osmocom/core/tdef.h M src/tdef.c M src/vty/tdef_vty.c M tests/tdef/tdef_test.c M tests/tdef/tdef_test.ok M tests/tdef/tdef_vty_test_config_root.c M tests/tdef/tdef_vty_test_config_root.vty 7 files changed, 138 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/46/15546/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15546 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4661ac41c29a009a1d5fc57d87aaee6041c7d1b2 Gerrit-Change-Number: 15546 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset
Change in ...libosmocore[master]: tdef_test: verify case where osmo_tdef_set returns -EEXIST
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/15563
Change subject: tdef_test: verify case where osmo_tdef_set returns -EEXIST
..
tdef_test: verify case where osmo_tdef_set returns -EEXIST
Change-Id: I436daa804aac11622fde24afe9ea35193d9e9beb
---
M tests/tdef/tdef_test.c
M tests/tdef/tdef_test.ok
2 files changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/63/15563/1
diff --git a/tests/tdef/tdef_test.c b/tests/tdef/tdef_test.c
index 60066b1..276330a 100644
--- a/tests/tdef/tdef_test.c
+++ b/tests/tdef/tdef_test.c
@@ -179,6 +179,9 @@
print_tdef_get_short(tdefs, 7, OSMO_TDEF_M);
print_tdef_get_short(tdefs, 7, OSMO_TDEF_CUSTOM);
+ printf("setting 23 = 50 (EEXIST)\n");
+ OSMO_ASSERT(osmo_tdef_set(tdefs, 23, 50, OSMO_TDEF_S) == -EEXIST);
+
printf("resetting\n");
osmo_tdefs_reset(tdefs);
print_tdef_info(7);
diff --git a/tests/tdef/tdef_test.ok b/tests/tdef/tdef_test.ok
index 2a3617e..3c4a093 100644
--- a/tests/tdef/tdef_test.ok
+++ b/tests/tdef/tdef_test.ok
@@ -117,6 +117,7 @@
osmo_tdef_get(7, s)= 420
osmo_tdef_get(7, m)= 7
osmo_tdef_get(7, custom-unit) = 420
+setting 23 = 50 (EEXIST)
resetting
T7=50s
osmo_tdef_get(7, s)= 50
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15563
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I436daa804aac11622fde24afe9ea35193d9e9beb
Gerrit-Change-Number: 15563
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in ...libosmocore[master]: logging.h: add L1 SAPI related context and filter
osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmocore/+/15538 ) Change subject: logging.h: add L1 SAPI related context and filter .. logging.h: add L1 SAPI related context and filter First user is osmo-bts in I6b7bb2e1d61502b61214f854a4ec5cbb7267545b. Related: OS#2356 Change-Id: I814cb3328d99faca9220adb5a80ffb934f219d7d --- M include/osmocom/core/logging.h 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h index 803b4a9..e56d3a5 100644 --- a/include/osmocom/core/logging.h +++ b/include/osmocom/core/logging.h @@ -154,6 +154,7 @@ LOG_CTX_GB_BVC, LOG_CTX_BSC_SUBSCR, LOG_CTX_VLR_SUBSCR, + LOG_CTX_L1_SAPI, _LOG_CTX_COUNT }; @@ -166,6 +167,7 @@ LOG_FLT_GB_BVC, LOG_FLT_BSC_SUBSCR, LOG_FLT_VLR_SUBSCR, + LOG_FLT_L1_SAPI, _LOG_FLT_COUNT }; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I814cb3328d99faca9220adb5a80ffb934f219d7d Gerrit-Change-Number: 15538 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in ...osmo-trx[master]: radioInterfaceMulti: Check equals zero explicitly
pespin has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-trx/+/15515 )
Change subject: radioInterfaceMulti: Check equals zero explicitly
..
radioInterfaceMulti: Check equals zero explicitly
It's not a pointer check or a boolean expression, in here we really
check chan index is 0, so it's more clear doing so this way like it's
done in all other places.
Change-Id: I83b14487d14ba8272f58796f640f58a88891e532
---
M Transceiver52M/radioInterfaceMulti.cpp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/Transceiver52M/radioInterfaceMulti.cpp
b/Transceiver52M/radioInterfaceMulti.cpp
index 7c1ee74..c41ec22 100644
--- a/Transceiver52M/radioInterfaceMulti.cpp
+++ b/Transceiver52M/radioInterfaceMulti.cpp
@@ -400,7 +400,7 @@
double RadioInterfaceMulti::setRxGain(double db, size_t chan)
{
- if (!chan)
+ if (chan == 0)
return mDevice->setRxGain(db);
else
return mDevice->getRxGain();
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15515
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I83b14487d14ba8272f58796f640f58a88891e532
Gerrit-Change-Number: 15515
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...osmo-trx[master]: USRPDevice: Fix setRxGain return on error and getRxGain() returning a...
pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-trx/+/15516 ) Change subject: USRPDevice: Fix setRxGain return on error and getRxGain() returning always 0 .. USRPDevice: Fix setRxGain return on error and getRxGain() returning always 0 field rxGain is set to 0 during constructor and never set after that point. Change-Id: I7fae7a315e5ab98a15c27628a88a92226ef89469 --- M Transceiver52M/device/usrp1/USRPDevice.cpp 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/Transceiver52M/device/usrp1/USRPDevice.cpp b/Transceiver52M/device/usrp1/USRPDevice.cpp index 63debee..ef3f92a 100644 --- a/Transceiver52M/device/usrp1/USRPDevice.cpp +++ b/Transceiver52M/device/usrp1/USRPDevice.cpp @@ -305,10 +305,11 @@ if (!m_dbRx->set_gain(dB)) LOGC(DDEV, ERR) << "Error setting RX gain"; - + else +rxGain = dB; writeLock.unlock(); - return dB; + return rxGain; } bool USRPDevice::setRxAntenna(const std::string , size_t chan) -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15516 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I7fae7a315e5ab98a15c27628a88a92226ef89469 Gerrit-Change-Number: 15516 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in ...osmo-trx[master]: USRPDevice: Return previous txGain if setting value failed
pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-trx/+/15517 ) Change subject: USRPDevice: Return previous txGain if setting value failed .. USRPDevice: Return previous txGain if setting value failed Change-Id: I0d8fd51586ef01141d4e5896f0fc3029a22743f8 --- M Transceiver52M/device/usrp1/USRPDevice.cpp M Transceiver52M/device/usrp1/USRPDevice.h 2 files changed, 5 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/Transceiver52M/device/usrp1/USRPDevice.cpp b/Transceiver52M/device/usrp1/USRPDevice.cpp index ef3f92a..03a4f80 100644 --- a/Transceiver52M/device/usrp1/USRPDevice.cpp +++ b/Transceiver52M/device/usrp1/USRPDevice.cpp @@ -71,6 +71,7 @@ decimRate = (unsigned int) round(masterClockRate/((GSMRATE) * (double) tx_sps)); actualSampleRate = masterClockRate/decimRate; rxGain = 0; + txGain = 0; /* * Undetermined delay b/w ping response timestamp and true @@ -279,10 +280,11 @@ if (!m_dbTx->set_gain(dB)) LOGC(DDEV, ERR) << "Error setting TX gain"; - + else +txGain = dB; writeLock.unlock(); - return dB; + return txGain; } diff --git a/Transceiver52M/device/usrp1/USRPDevice.h b/Transceiver52M/device/usrp1/USRPDevice.h index 4123c7d..734b361 100644 --- a/Transceiver52M/device/usrp1/USRPDevice.h +++ b/Transceiver52M/device/usrp1/USRPDevice.h @@ -80,6 +80,7 @@ unsigned long lastPktTimestamp; double rxGain; + double txGain; #ifdef SWLOOPBACK short loopbackBuffer[100]; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15517 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I0d8fd51586ef01141d4e5896f0fc3029a22743f8 Gerrit-Change-Number: 15517 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in ...osmo-trx[master]: radioInterface: Rename mRadio to mDevice
pespin has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-trx/+/15514 )
Change subject: radioInterface: Rename mRadio to mDevice
..
radioInterface: Rename mRadio to mDevice
Previous naming is ready confusing, because "Radio" is actually the
common term between radioInterface and radioDevice, and it looks like
it's referring to radioInterface rather than radioDevice. On the other
hand, mDevice cleary states it refers to the radioDevice item.
Change-Id: I708bb1992a156fb63334f5590f2c6648ca27495e
---
M Transceiver52M/radioInterface.cpp
M Transceiver52M/radioInterface.h
M Transceiver52M/radioInterfaceMulti.cpp
M Transceiver52M/radioInterfaceResamp.cpp
4 files changed, 37 insertions(+), 37 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
daniel: Looks good to me, approved
diff --git a/Transceiver52M/radioInterface.cpp
b/Transceiver52M/radioInterface.cpp
index 0d33f22..bd19b24 100644
--- a/Transceiver52M/radioInterface.cpp
+++ b/Transceiver52M/radioInterface.cpp
@@ -32,10 +32,10 @@
#define CHUNK 625
#define NUMCHUNKS 4
-RadioInterface::RadioInterface(RadioDevice *wRadio, size_t tx_sps,
+RadioInterface::RadioInterface(RadioDevice *wDevice, size_t tx_sps,
size_t rx_sps, size_t chans,
int wReceiveOffset, GSM::Time wStartTime)
- : mRadio(wRadio), mSPSTx(tx_sps), mSPSRx(rx_sps), mChans(chans),
+ : mDevice(wDevice), mSPSTx(tx_sps), mSPSRx(rx_sps), mChans(chans),
underrun(false), overrun(false), writeTimestamp(0), readTimestamp(0),
receiveOffset(wReceiveOffset), mOn(false)
{
@@ -93,11 +93,11 @@
}
double RadioInterface::fullScaleInputValue(void) {
- return mRadio->fullScaleInputValue();
+ return mDevice->fullScaleInputValue();
}
double RadioInterface::fullScaleOutputValue(void) {
- return mRadio->fullScaleOutputValue();
+ return mDevice->fullScaleOutputValue();
}
int RadioInterface::setPowerAttenuation(int atten, size_t chan)
@@ -112,8 +112,8 @@
if (atten < 0.0)
atten = 0.0;
- rfGain = mRadio->setTxGain(mRadio->maxTxGain() - (double) atten, chan);
- digAtten = (double) atten - mRadio->maxTxGain() + rfGain;
+ rfGain = mDevice->setTxGain(mDevice->maxTxGain() - (double) atten, chan);
+ digAtten = (double) atten - mDevice->maxTxGain() + rfGain;
if (digAtten < 1.0)
powerScaling[chan] = 1.0;
@@ -148,12 +148,12 @@
bool RadioInterface::tuneTx(double freq, size_t chan)
{
- return mRadio->setTxFreq(freq, chan);
+ return mDevice->setTxFreq(freq, chan);
}
bool RadioInterface::tuneRx(double freq, size_t chan)
{
- return mRadio->setRxFreq(freq, chan);
+ return mDevice->setRxFreq(freq, chan);
}
/** synchronization thread loop */
@@ -169,7 +169,7 @@
}
void RadioInterface::alignRadio() {
- mRadio->updateAlignment(writeTimestamp+ (TIMESTAMP) 1);
+ mDevice->updateAlignment(writeTimestamp+ (TIMESTAMP) 1);
}
bool RadioInterface::start()
@@ -178,12 +178,12 @@
return true;
LOG(INFO) << "Starting radio device";
- if (mRadio->requiresRadioAlign())
+ if (mDevice->requiresRadioAlign())
mAlignRadioServiceLoopThread.start(
(void *
(*)(void*))AlignRadioServiceLoopAdapter,
(void*)this);
- if (!mRadio->start())
+ if (!mDevice->start())
return false;
for (size_t i = 0; i < mChans; i++) {
@@ -191,11 +191,11 @@
recvBuffer[i]->reset();
}
- writeTimestamp = mRadio->initialWriteTimestamp();
- readTimestamp = mRadio->initialReadTimestamp();
+ writeTimestamp = mDevice->initialWriteTimestamp();
+ readTimestamp = mDevice->initialReadTimestamp();
- mRadio->updateAlignment(writeTimestamp-1);
- mRadio->updateAlignment(writeTimestamp-1);
+ mDevice->updateAlignment(writeTimestamp-1);
+ mDevice->updateAlignment(writeTimestamp-1);
mOn = true;
LOG(INFO) << "Radio started";
@@ -211,7 +211,7 @@
*/
bool RadioInterface::stop()
{
- if (!mOn || !mRadio->stop())
+ if (!mOn || !mDevice->stop())
return false;
mOn = false;
@@ -304,12 +304,12 @@
double RadioInterface::setRxGain(double dB, size_t chan)
{
- return mRadio->setRxGain(dB, chan);
+ return mDevice->setRxGain(dB, chan);
}
double RadioInterface::getRxGain(size_t chan)
{
- return mRadio->getRxGain(chan);
+ return mDevice->getRxGain(chan);
}
/* Receive a timestamped chunk from the device */
@@ -323,7 +323,7 @@
return -1;
/* Outer buffer access size is fixed */
- numRecv = mRadio->readSamples(convertRecvBuffer,
+ numRecv = mDevice->readSamples(convertRecvBuffer,
segmentLen,
,
readTimestamp,
@@ -362,7 +362,7 @@
}
/* Send the all samples in the send buffer */
- numSent = mRadio->writeSamples(convertSendBuffer,
+ numSent
Change in ...osmo-trx[master]: LMSDevice: Return previous txGain/rxGain if setting value failed
pespin has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-trx/+/15518 )
Change subject: LMSDevice: Return previous txGain/rxGain if setting value failed
..
LMSDevice: Return previous txGain/rxGain if setting value failed
Change-Id: I11e853e11bec99fc88e81642f9b2cd87d5815398
---
M Transceiver52M/device/lms/LMSDevice.cpp
M Transceiver52M/device/lms/LMSDevice.h
2 files changed, 10 insertions(+), 6 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/Transceiver52M/device/lms/LMSDevice.cpp
b/Transceiver52M/device/lms/LMSDevice.cpp
index b7cb31d..feeb646 100644
--- a/Transceiver52M/device/lms/LMSDevice.cpp
+++ b/Transceiver52M/device/lms/LMSDevice.cpp
@@ -55,6 +55,8 @@
m_lms_stream_rx.resize(chans);
m_lms_stream_tx.resize(chans);
+ rx_gains.resize(chans);
+ tx_gains.resize(chans);
rx_buffers.resize(chans);
}
@@ -412,8 +414,9 @@
if (LMS_SetGaindB(m_lms_dev, LMS_CH_TX, chan, dB) < 0)
LOGCHAN(chan, DDEV, ERR) << "Error setting TX gain to " << dB
<< " dB";
-
- return dB;
+ else
+ tx_gains[chan] = dB;
+ return tx_gains[chan];
}
double LMSDevice::setRxGain(double dB, size_t chan)
@@ -427,8 +430,9 @@
if (LMS_SetGaindB(m_lms_dev, LMS_CH_RX, chan, dB) < 0)
LOGCHAN(chan, DDEV, ERR) << "Error setting RX gain to " << dB
<< " dB";
-
- return dB;
+ else
+ rx_gains[chan] = dB;
+ return rx_gains[chan];
}
void LMSDevice::log_ant_list(bool dir_tx, size_t chan, std::ostringstream& os)
diff --git a/Transceiver52M/device/lms/LMSDevice.h
b/Transceiver52M/device/lms/LMSDevice.h
index ab45b08..71a706c 100644
--- a/Transceiver52M/device/lms/LMSDevice.h
+++ b/Transceiver52M/device/lms/LMSDevice.h
@@ -58,7 +58,7 @@
TIMESTAMP ts_initial, ts_offset;
- double rxGain;
+ std::vector tx_gains, rx_gains;
double maxTxGainClamp;
bool do_calib(size_t chan);
@@ -150,7 +150,7 @@
/** get the current receive gain */
double getRxGain(size_t chan = 0) {
- return rxGain;
+ return rx_gains[chan];
}
/** return maximum Rx Gain **/
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15518
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I11e853e11bec99fc88e81642f9b2cd87d5815398
Gerrit-Change-Number: 15518
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...libosmocore[master]: tdef: Introduce min_val and max_val fields
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15546 ) Change subject: tdef: Introduce min_val and max_val fields .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15546/1/src/tdef.c File src/tdef.c: https://gerrit.osmocom.org/#/c/15546/1/src/tdef.c@235 PS1, Line 235: EINVAL > also prefer -ERANGE. […] Yes it should, see tdef_vty.c -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15546 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4661ac41c29a009a1d5fc57d87aaee6041c7d1b2 Gerrit-Change-Number: 15546 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 18 Sep 2019 11:18:41 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: neels Gerrit-MessageType: comment
Change in ...osmo-trx[master]: radioInterface: Rename mRadio to mDevice
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15514 ) Change subject: radioInterface: Rename mRadio to mDevice .. Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/15514/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15514/1//COMMIT_MSG@9 PS1, Line 9: ready really? -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15514 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I708bb1992a156fb63334f5590f2c6648ca27495e Gerrit-Change-Number: 15514 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 18 Sep 2019 11:06:10 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmocore[master]: tdef: Introduce min_val and max_val fields
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15546 ) Change subject: tdef: Introduce min_val and max_val fields .. Patch Set 1: > Patch Set 1: Code-Review-1 > > (7 comments) > > All in all very nice. > > Please also add range tests to all of the *.vty transcript tests, see > tests/tdef/tdef_vty*, so that we can also verify the VTY behavior. > > BTW, in order to benefit from the range checks, all tdef users need to be > changed to use osmo_tdef_set() instead of osmo_tdef_get_entry()? Do you have > related patches? ... just realizing that this only needs to be done as soon > as an application actually sets min and max values, so that should be fine. > But this should be mentioned in the API doc of the new min and max members. Most tdef users actually set the values through VTY, and that one is already checking for ranges (done in this patch). I recently introduced osmo_tdef_set myself in osmo-pcu for timers whose values are coming from osmo-bts, so those are working already. I still need to check if there are other users os osmo_tdef setting tdef->val manually. But in any case it doesn't hurt because they don't have min_val or max_val set, so range check is not applied there. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15546 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4661ac41c29a009a1d5fc57d87aaee6041c7d1b2 Gerrit-Change-Number: 15546 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 18 Sep 2019 10:49:29 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-bsc[master]: bsc_subscr_conn_fsm: Cleanly clear BSSAP conn if associated channel c...
Hello fixeria, neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/15408 to look at the new patch set (#4). Change subject: bsc_subscr_conn_fsm: Cleanly clear BSSAP conn if associated channel closed during WAIT_CC .. bsc_subscr_conn_fsm: Cleanly clear BSSAP conn if associated channel closed during WAIT_CC TTCN3 BSC_Tests.TC_ms_rel_ind_does_not_cause_bssmap_reset seems to sometimes run into a race condition on the order of messages received by osmo-bsc comming from MSC and BTS. Usual (expected) scenario): BTS->BSC EST IND BSC->MSC CL3 Info BSC<-MSC CC BTS->BSC REL IND BTS<-BSC DEACT SACCH BSC->MSC ClearRequest BSC<-MSC ClearCommand BSC->MSC ClearComplete BTS<-BSC RF Chan Release BTS->BSC RF Chan Release ACK Sometimes CC message and REL IND message are received swapped (because they are sent by different components asynchronously in TTCN3). As a result, osmo-bsc was failing to go into CLEARING state and was unable to send the ClearRequest because CC was still not received. So the idea is to stay in WAIT_CC until CC is received, then check if the lchan was dropped and in that case go into clearing state. Change-Id: Id1abf5ee44c60925b478123409f26bd29006202b --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 28 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/08/15408/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15408 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id1abf5ee44c60925b478123409f26bd29006202b Gerrit-Change-Number: 15408 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in ...libosmocore[master]: logging: Move extern declaration of osmo_log_target_list from logging...
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/15559 to look at the new patch set (#2). Change subject: logging: Move extern declaration of osmo_log_target_list from logging.h to logging_internal.h .. logging: Move extern declaration of osmo_log_target_list from logging.h to logging_internal.h This list is really not needed by applications and currently only used internally in logging.c and logging_vty.c. Change-Id: I5dca069512bfcd0826194427c5482fad8bfd0232 --- M include/osmocom/core/logging.h M include/osmocom/core/logging_internal.h 2 files changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/59/15559/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15559 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5dca069512bfcd0826194427c5482fad8bfd0232 Gerrit-Change-Number: 15559 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-CC: neels Gerrit-MessageType: newpatchset
Change in ...libosmocore[master]: logging: Introduce mutex API to manage log_target in multi-thread envs
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/15560 to look at the new patch set (#3). Change subject: logging: Introduce mutex API to manage log_target in multi-thread envs .. logging: Introduce mutex API to manage log_target in multi-thread envs * log_enable_multithread() enables use of locks inside the implementation. Lock use is disabled by default, this way only multi-thread processes need to enable it and suffer related complexity/performance penalties. Locks are required around osmo_log_target_list and items inside it, since targets can be used, modified and deleted by different threads concurrently (for instance, user writing "logging disable" in VTY while another thread is willing to write into that target). Multithread apps and libraries aiming at being used in multithread apps should update their code to use the locks introduced here when containing code iterating over osmo_log_target_list explictly or implicitly by obtaining a log_target (eg. osmo_log_vty2tgt()). Related: OS#4088 Change-Id: Id7711893b34263baacac6caf4d489467053131bb --- M include/osmocom/core/logging.h M src/gb/gprs_bssgp_vty.c M src/gb/gprs_ns_vty.c M src/logging.c M src/vty/logging_vty.c M tests/logging/logging_vty_test.c 6 files changed, 219 insertions(+), 93 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/60/15560/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id7711893b34263baacac6caf4d489467053131bb Gerrit-Change-Number: 15560 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-MessageType: newpatchset
Change in ...libosmocore[master]: logging: Introduce mutex API to manage log_target in multi-thread envs
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15560 ) Change subject: logging: Introduce mutex API to manage log_target in multi-thread envs .. Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/15560/2/include/osmocom/core/logging.h File include/osmocom/core/logging.h: https://gerrit.osmocom.org/#/c/15560/2/include/osmocom/core/logging.h@383 PS2, Line 383: #define LOG_MTX_DEBUG 0 > would be nicer if using programs could somehow set LOG_MTX_DEBUG 1 without > re-installing entire libo […] I prefer to keep it compile-time only, I don't want to introduce more unneeded performance penalties. This feature is more a handy development/debugging tool in case a deadlock is detected somewhere during development (for instance, adding/changing a logging vty command and forgetting an unlock()). https://gerrit.osmocom.org/#/c/15560/2/include/osmocom/core/logging.h@392 PS2, Line 392: void log_tgt_mutex_unlock(void); > I guess it would be cleaner if both cases created symbols of the same kind. > i.e. […] Same as explained above. The LOG_MTX_DEBUG case is not intended to be ever deployed in normal cases, simply some code easy to enable and rebuild which can help in some specific cases. Converting the symbol to a define and rebuilding libosmocore (+ possibly app) allows for prints to be executed without changing any other code and avoid performance penalties in 99.9% of the times this function is going to ever be called. I could have kept this privat eto myself but it was useful to debug an issue I introduced while writing the patch, and I thought it'd be nice to have feature if someone have a similar issue in the future or wants to understand better how locking works here. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id7711893b34263baacac6caf4d489467053131bb Gerrit-Change-Number: 15560 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Wed, 18 Sep 2019 10:33:56 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment
Change in ...libosmocore[master]: logging.h: add L1 SAPI related context and filter
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15538 ) Change subject: logging.h: add L1 SAPI related context and filter .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I814cb3328d99faca9220adb5a80ffb934f219d7d Gerrit-Change-Number: 15538 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 18 Sep 2019 09:58:41 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: bts: test for "logging filter l1-sapi"
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15540 ) Change subject: bts: test for "logging filter l1-sapi" .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15540 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8c7f113eae7a93c6d4943cac9e3f49f153b323b1 Gerrit-Change-Number: 15540 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 18 Sep 2019 09:58:20 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmocore[master]: logging: Move osmo_log_target_list from logging.h to logging_internal.h
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15559 ) Change subject: logging: Move osmo_log_target_list from logging.h to logging_internal.h .. Patch Set 1: the commit log message indicates a list is moved. In reality, it's just the forward declaration that is moved; the location of the actual list remains the same. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15559 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5dca069512bfcd0826194427c5482fad8bfd0232 Gerrit-Change-Number: 15559 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-CC: neels Gerrit-Comment-Date: Wed, 18 Sep 2019 08:55:01 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...libosmocore[master]: logging_internal.h: Fix osmo_log_info definition
laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmocore/+/15558 ) Change subject: logging_internal.h: Fix osmo_log_info definition .. logging_internal.h: Fix osmo_log_info definition Global symbol osmo_log_info is declared in logging.c as non-const, because it is modified. As soon as logging_internal.h is included into logging.c, the compiler warns about osmo_log_info being declared twice differently. Change-Id: Iea961c3caeb12ddf60c99d4dca644bb9ab538767 --- M include/osmocom/core/logging_internal.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/core/logging_internal.h b/include/osmocom/core/logging_internal.h index a510f83..01c96ce 100644 --- a/include/osmocom/core/logging_internal.h +++ b/include/osmocom/core/logging_internal.h @@ -7,7 +7,7 @@ #include extern void *tall_log_ctx; -extern const struct log_info *osmo_log_info; +extern struct log_info *osmo_log_info; extern const struct value_string loglevel_strs[]; void assert_loginfo(const char *src); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iea961c3caeb12ddf60c99d4dca644bb9ab538767 Gerrit-Change-Number: 15558 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-MessageType: merged
Change in ...libosmocore[master]: logging_internal.h: Fix osmo_log_info definition
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15558 ) Change subject: logging_internal.h: Fix osmo_log_info definition .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iea961c3caeb12ddf60c99d4dca644bb9ab538767 Gerrit-Change-Number: 15558 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Wed, 18 Sep 2019 08:53:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-msc[master]: fix error on BSSMAP Cipher Mode Complete L3 msg IE
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15317 ) Change subject: fix error on BSSMAP Cipher Mode Complete L3 msg IE .. Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Icd8dad18d6dda24d075dd8da72c3d6db1302090d Gerrit-Change-Number: 15317 Gerrit-PatchSet: 7 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Wed, 18 Sep 2019 08:52:28 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-pcu[master]: [DO NOT MERGE] jenkins gerrit-verifications test commit
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15562 Change subject: [DO NOT MERGE] jenkins gerrit-verifications test commit .. [DO NOT MERGE] jenkins gerrit-verifications test commit Related: OS#4204 Change-Id: I219b68fc3e866bdd065200ed662b10134e2ce106 --- A do_not_merge 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/62/15562/1 diff --git a/do_not_merge b/do_not_merge new file mode 100644 index 000..e69de29 --- /dev/null +++ b/do_not_merge -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15562 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I219b68fc3e866bdd065200ed662b10134e2ce106 Gerrit-Change-Number: 15562 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
Change in ...osmo-bts[master]: vty: add "logging filter l1-sapi"
Hello neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/15550 to look at the new patch set (#3). Change subject: vty: add "logging filter l1-sapi" .. vty: add "logging filter l1-sapi" Add VTY commands to filter by L1 SAPI. Allow to filter by multiple SAPIs by running the filter command multiple times: OsmoBTS> logging filter l1-sapi agch OsmoBTS> logging filter l1-sapi pch Related: OS#2356 Test: (osmo-ttcn3-hacks) I8c7f113eae7a93c6d4943cac9e3f49f153b323b1 Change-Id: I32d86d3d34757135b4cce59919c2fc2b67f0a889 --- M src/common/logging.c M src/common/vty.c 2 files changed, 77 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/50/15550/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15550 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I32d86d3d34757135b4cce59919c2fc2b67f0a889 Gerrit-Change-Number: 15550 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-bts[master]: vty: add "logging filter l1-sapi"
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15550 ) Change subject: vty: add "logging filter l1-sapi" .. Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/15550/2/src/common/logging.c File src/common/logging.c: https://gerrit.osmocom.org/#/c/15550/2/src/common/logging.c@32 PS2, Line 32: #include > do we need this include? We don't, removed. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15550 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I32d86d3d34757135b4cce59919c2fc2b67f0a889 Gerrit-Change-Number: 15550 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 18 Sep 2019 08:19:12 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment
Change in ...osmo-bts[master]: vty: add "logging filter l1-sapi"
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15550 ) Change subject: vty: add "logging filter l1-sapi" .. Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/15550/2/src/common/logging.c File src/common/logging.c: https://gerrit.osmocom.org/#/c/15550/2/src/common/logging.c@32 PS2, Line 32: #include do we need this include? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15550 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I32d86d3d34757135b4cce59919c2fc2b67f0a889 Gerrit-Change-Number: 15550 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 18 Sep 2019 08:13:18 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: bts: test for "logging filter l1-sapi"
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15540 ) Change subject: bts: test for "logging filter l1-sapi" .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15540 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8c7f113eae7a93c6d4943cac9e3f49f153b323b1 Gerrit-Change-Number: 15540 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 18 Sep 2019 08:11:16 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmocore[master]: logging.h: add L1 SAPI related context and filter
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15538 ) Change subject: logging.h: add L1 SAPI related context and filter .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I814cb3328d99faca9220adb5a80ffb934f219d7d Gerrit-Change-Number: 15538 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 18 Sep 2019 08:10:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-bts[master]: vty: add "logging filter l1-sapi"
osmith has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/15550 )
Change subject: vty: add "logging filter l1-sapi"
..
Patch Set 2:
(2 comments)
https://gerrit.osmocom.org/#/c/15550/1/src/common/vty.c
File src/common/vty.c:
https://gerrit.osmocom.org/#/c/15550/1/src/common/vty.c@1607
PS1, Line 1607: uint16_t parse_l1_sapi_str(const char *sapi) {
> there is a sapi_string[] in pcu_sock.c ... it is uppercase though. […]
Done
https://gerrit.osmocom.org/#/c/15550/1/src/common/vty.c@1640
PS1, Line 1640: *sapi_mask = talloc(tgt, uint16_t);
> initially I was sure that this was a memleak; instead: kudos for getting this
> right.
yay, thanks :D
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15550
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I32d86d3d34757135b4cce59919c2fc2b67f0a889
Gerrit-Change-Number: 15550
Gerrit-PatchSet: 2
Gerrit-Owner: osmith
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels
Gerrit-Reviewer: osmith
Gerrit-CC: pespin
Gerrit-Comment-Date: Wed, 18 Sep 2019 07:48:36 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin
Comment-In-Reply-To: neels
Gerrit-MessageType: comment
Change in ...osmo-bts[master]: log: set L1 SAPI context
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15539 ) Change subject: log: set L1 SAPI context .. Patch Set 4: (2 comments) As I've read through both osmo-bts patches, I realized that it makes more sense to put the osmo_bts_filter_fn() function into the other patch. That way, this first patch only sets the log context. So I've moved it. https://gerrit.osmocom.org/#/c/15539/3/src/common/logging.c File src/common/logging.c: https://gerrit.osmocom.org/#/c/15539/3/src/common/logging.c@148 PS3, Line 148: static int filter_fn(const struct log_context *ctx, struct log_target *tgt) > (personally would prefer "osmo_bts_filter_fn()" to not overload other > generally named filter_fn()s f […] Done. https://gerrit.osmocom.org/#/c/15539/3/src/common/logging.c@158 PS3, Line 158: return 1; > Looking at osmo_bsc_main.c filter_fn(), it seems that the intention is this: > […] Thank you very much for explaining, updated this code and the test to properly use "logging set filter". -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15539 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6b7bb2e1d61502b61214f854a4ec5cbb7267545b Gerrit-Change-Number: 15539 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 18 Sep 2019 07:47:47 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Comment-In-Reply-To: osmith Gerrit-MessageType: comment
Change in ...libosmocore[master]: logging.h: add L1 SAPI related context and filter
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15538 ) Change subject: logging.h: add L1 SAPI related context and filter .. Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/15538/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15538/2//COMMIT_MSG@7 PS2, Line 7: logging.h: add L1 SAPI related context and filter > would be nice to mention the program that is going to be the first user of > this, maybe even a change […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I814cb3328d99faca9220adb5a80ffb934f219d7d Gerrit-Change-Number: 15538 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 18 Sep 2019 07:44:15 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: bts: test for "logging filter l1-sapi"
Hello pespin, fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15540 to look at the new patch set (#4). Change subject: bts: test for "logging filter l1-sapi" .. bts: test for "logging filter l1-sapi" Related: OS#2356 Change-Id: I8c7f113eae7a93c6d4943cac9e3f49f153b323b1 --- M bts/BTS_Tests.ttcn 1 file changed, 50 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/40/15540/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15540 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8c7f113eae7a93c6d4943cac9e3f49f153b323b1 Gerrit-Change-Number: 15540 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in ...libosmocore[master]: logging.h: add L1 SAPI related context and filter
Hello pespin, fixeria, neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/15538 to look at the new patch set (#3). Change subject: logging.h: add L1 SAPI related context and filter .. logging.h: add L1 SAPI related context and filter First user is osmo-bts in I6b7bb2e1d61502b61214f854a4ec5cbb7267545b. Related: OS#2356 Change-Id: I814cb3328d99faca9220adb5a80ffb934f219d7d --- M include/osmocom/core/logging.h 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/38/15538/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I814cb3328d99faca9220adb5a80ffb934f219d7d Gerrit-Change-Number: 15538 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-bts[master]: vty: add "logging filter l1-sapi"
Hello neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/15550 to look at the new patch set (#2). Change subject: vty: add "logging filter l1-sapi" .. vty: add "logging filter l1-sapi" Add VTY commands to filter by L1 SAPI. Allow to filter by multiple SAPIs by running the filter command multiple times: OsmoBTS> logging filter l1-sapi agch OsmoBTS> logging filter l1-sapi pch Related: OS#2356 Test: (osmo-ttcn3-hacks) I8c7f113eae7a93c6d4943cac9e3f49f153b323b1 Change-Id: I32d86d3d34757135b4cce59919c2fc2b67f0a889 --- M src/common/logging.c M src/common/vty.c 2 files changed, 78 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/50/15550/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15550 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I32d86d3d34757135b4cce59919c2fc2b67f0a889 Gerrit-Change-Number: 15550 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-bts[master]: log: set L1 SAPI context
Hello fixeria, pespin, neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/15539 to look at the new patch set (#4). Change subject: log: set L1 SAPI context .. log: set L1 SAPI context The next commit adds related VTY commands. I've decided to use the global variable sapi_log_ctx instead of directly pointing at pcu_prim->...sapi, because pcu_prim is part of a msgb, which gets deallocated before the log context gets reset. Related: OS#2356 Depends: (libosmocore) I814cb3328d99faca9220adb5a80ffb934f219d7d Change-Id: I6b7bb2e1d61502b61214f854a4ec5cbb7267545b --- M src/common/pcu_sock.c 1 file changed, 40 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/39/15539/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15539 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6b7bb2e1d61502b61214f854a4ec5cbb7267545b Gerrit-Change-Number: 15539 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: newpatchset
