Build failure of network:osmocom:latest/osmo-trx in Debian_Testing/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 841s] ar: `u' modifier ignored since `D' is the default (see `U') [ 841s] libtool: link: ranlib .libs/libtransceiver_common.a [ 841s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 841s] /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 [ 841s] 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 [ 842s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 842s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 842s] collect2: error: ld returned 1 exit status [ 842s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 842s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 842s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 842s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 842s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 842s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 842s] make[1]: *** [Makefile:444: all] Error 2 [ 842s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 842s] dh_auto_build: make -j1 returned exit code 2 [ 842s] make: *** [debian/rules:6: build] Error 255 [ 842s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 842s] [ 842s] lamb26 failed "build osmo-trx_1.1.1.dsc" at Sat Sep 28 01:48:25 UTC 2019. [ 842s] [ 842s] ### VM INTERACTION START ### [ 845s] [ 811.845485] sysrq: SysRq : Power Off [ 845s] [ 811.875440] reboot: Power down [ 845s] ### VM INTERACTION END ### [ 845s] [ 845s] lamb26 failed "build osmo-trx_1.1.1.dsc" at Sat Sep 28 01:48:29 UTC 2019. [ 845s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-trx in Debian_Testing/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 774s] ar: `u' modifier ignored since `D' is the default (see `U') [ 774s] libtool: link: ranlib .libs/libtransceiver_common.a [ 774s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 774s] /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 [ 775s] 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 [ 775s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 775s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 775s] collect2: error: ld returned 1 exit status [ 775s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 775s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 775s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 775s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 775s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 775s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 775s] make[1]: *** [Makefile:444: all] Error 2 [ 775s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 775s] dh_auto_build: make -j1 returned exit code 2 [ 775s] make: *** [debian/rules:6: build] Error 255 [ 775s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 775s] [ 775s] build81 failed "build osmo-trx_1.1.1.28.ee2b.dsc" at Sat Sep 28 01:34:32 UTC 2019. [ 775s] [ 775s] ### VM INTERACTION START ### [ 779s] [ 697.523898] sysrq: SysRq : Power Off [ 779s] [ 697.537780] reboot: Power down [ 779s] ### VM INTERACTION END ### [ 779s] [ 779s] build81 failed "build osmo-trx_1.1.1.28.ee2b.dsc" at Sat Sep 28 01:34:36 UTC 2019. [ 779s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/)
Change in ...osmo-bts[master]: struct gsm_bts: Add model_priv pointer handing bts_model specific data
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/15613 to look at the new patch set (#3). Change subject: struct gsm_bts: Add model_priv pointer handing bts_model specific data .. struct gsm_bts: Add model_priv pointer handing bts_model specific data Existing model specific data is moved there. Change-Id: Ib17a752cdbaa7d5eb8c5dfa0b197f80a4f38b38e --- M include/osmo-bts/gsm_data_shared.h M src/osmo-bts-oc2g/l1_if.h M src/osmo-bts-oc2g/main.c M src/osmo-bts-virtual/l1_if.h M src/osmo-bts-virtual/main.c M src/osmo-bts-virtual/scheduler_virtbts.c 6 files changed, 33 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/13/15613/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15613 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib17a752cdbaa7d5eb8c5dfa0b197f80a4f38b38e Gerrit-Change-Number: 15613 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...libosmocore[master]: tdef: Introduce min_val and max_val fields
Hello fixeria, neels, osmith, 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 (#7). 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, 175 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/46/15546/7 -- 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: 7 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset
Change in ...osmo-bts[master]: struct gsm_bts: Add model_priv pointer handing bts_model specific data
pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-bts/+/15613 ) Change subject: struct gsm_bts: Add model_priv pointer handing bts_model specific data .. struct gsm_bts: Add model_priv pointer handing bts_model specific data Existing model specific data is moved there. Change-Id: Ib17a752cdbaa7d5eb8c5dfa0b197f80a4f38b38e --- M include/osmo-bts/gsm_data_shared.h M src/osmo-bts-oc2g/l1_if.h M src/osmo-bts-oc2g/main.c M src/osmo-bts-virtual/l1_if.h M src/osmo-bts-virtual/main.c M src/osmo-bts-virtual/scheduler_virtbts.c 6 files changed, 33 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/13/15613/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15613 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib17a752cdbaa7d5eb8c5dfa0b197f80a4f38b38e Gerrit-Change-Number: 15613 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-bts[master]: bts-trx: Allocate struct osmo_trx_clock_state as part of bts-trx priv...
pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-bts/+/15614 ) Change subject: bts-trx: Allocate struct osmo_trx_clock_state as part of bts-trx private data .. bts-trx: Allocate struct osmo_trx_clock_state as part of bts-trx private data Change-Id: I9b7ffb51423ada74b8be347c57eade08f307f88f --- M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/main.c M src/osmo-bts-trx/scheduler_trx.c 3 files changed, 52 insertions(+), 44 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/14/15614/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15614 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I9b7ffb51423ada74b8be347c57eade08f307f88f Gerrit-Change-Number: 15614 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-bts[master]: bts-trx: Move transceiver_available as part of bts-trx private data
pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-bts/+/15615 ) Change subject: bts-trx: Move transceiver_available as part of bts-trx private data .. bts-trx: Move transceiver_available as part of bts-trx private data Change-Id: I35f4697bd33dbe8a4c76c9500b82c16589c701d4 --- M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/scheduler_trx.c M src/osmo-bts-trx/trx_if.c M src/osmo-bts-trx/trx_if.h M src/osmo-bts-trx/trx_vty.c 6 files changed, 37 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/15/15615/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15615 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I35f4697bd33dbe8a4c76c9500b82c16589c701d4 Gerrit-Change-Number: 15615 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-bts[master]: bts-trx: Allocate struct osmo_trx_clock_state as part of bts-trx priv...
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/15614
Change subject: bts-trx: Allocate struct osmo_trx_clock_state as part of
bts-trx private data
..
bts-trx: Allocate struct osmo_trx_clock_state as part of bts-trx private data
Change-Id: I9b7ffb51423ada74b8be347c57eade08f307f88f
---
M src/osmo-bts-trx/l1_if.h
M src/osmo-bts-trx/main.c
M src/osmo-bts-trx/scheduler_trx.c
3 files changed, 52 insertions(+), 44 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/14/15614/1
diff --git a/src/osmo-bts-trx/l1_if.h b/src/osmo-bts-trx/l1_if.h
index 87df951..29bd246 100644
--- a/src/osmo-bts-trx/l1_if.h
+++ b/src/osmo-bts-trx/l1_if.h
@@ -5,6 +5,50 @@
#include
#include "trx_if.h"
+/*
+ * TRX frame clock handling
+ *
+ * In a "normal" synchronous PHY layer, we would be polled every time
+ * the PHY needs data for a given frame number. However, the
+ * OpenBTS-inherited TRX protocol works differently: We (L1) must
+ * autonomously send burst data based on our own clock, and every so
+ * often (currently every ~ 216 frames), we get a clock indication from
+ * the TRX.
+ *
+ * We're using a MONOTONIC timerfd interval timer for the 4.615ms frame
+ * intervals, and then compute + send the 8 bursts for that frame.
+ *
+ * Upon receiving a clock indication from the TRX, we compensate
+ * accordingly: If we were transmitting too fast, we're delaying the
+ * next interval timer accordingly. If we were too slow, we immediately
+ * send burst data for the missing frame numbers.
+ */
+
+/*! clock state of a given TRX */
+struct osmo_trx_clock_state {
+ /*! number of FN periods without TRX clock indication */
+ uint32_t fn_without_clock_ind;
+ struct {
+ /*! last FN we processed based on FN period timer */
+ uint32_t fn;
+ /*! time at which we last processed FN */
+ struct timespec tv;
+ } last_fn_timer;
+ struct {
+ /*! last FN we received a clock indication for */
+ uint32_t fn;
+ /*! time at which we received the last clock indication */
+ struct timespec tv;
+ } last_clk_ind;
+ /*! Osmocom FD wrapper for timerfd */
+ struct osmo_fd fn_timer_ofd;
+};
+
+/* gsm_bts->model_priv, specific to osmo-bts-trx */
+struct bts_trx_priv {
+ struct osmo_trx_clock_state clk_s;
+};
+
struct trx_config {
uint8_t trxd_hdr_ver_req; /* requested TRXD header
version */
uint8_t trxd_hdr_ver_use; /* actual TRXD header version
in use */
diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c
index b1fa207..cf40ea3 100644
--- a/src/osmo-bts-trx/main.c
+++ b/src/osmo-bts-trx/main.c
@@ -97,6 +97,10 @@
int bts_model_init(struct gsm_bts *bts)
{
+ struct bts_trx_priv *bts_trx = talloc_zero(bts, struct bts_trx_priv);
+ bts_trx->clk_s.fn_timer_ofd.fd = -1;
+
+ bts->model_priv = bts_trx;
bts->variant = BTS_OSMO_TRX;
bts->support.ciphers = CIPHER_A5(1) | CIPHER_A5(2) | CIPHER_A5(3);
diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c
index 8b0c761..6c3a8ff 100644
--- a/src/osmo-bts-trx/scheduler_trx.c
+++ b/src/osmo-bts-trx/scheduler_trx.c
@@ -1580,48 +1580,6 @@
return 0;
}
-/*
- * TRX frame clock handling
- *
- * In a "normal" synchronous PHY layer, we would be polled every time
- * the PHY needs data for a given frame number. However, the
- * OpenBTS-inherited TRX protocol works differently: We (L1) must
- * autonomously send burst data based on our own clock, and every so
- * often (currently every ~ 216 frames), we get a clock indication from
- * the TRX.
- *
- * We're using a MONOTONIC timerfd interval timer for the 4.615ms frame
- * intervals, and then compute + send the 8 bursts for that frame.
- *
- * Upon receiving a clock indication from the TRX, we compensate
- * accordingly: If we were transmitting too fast, we're delaying the
- * next interval timer accordingly. If we were too slow, we immediately
- * send burst data for the missing frame numbers.
- */
-
-/*! clock state of a given TRX */
-struct osmo_trx_clock_state {
- /*! number of FN periods without TRX clock indication */
- uint32_t fn_without_clock_ind;
- struct {
- /*! last FN we processed based on FN period timer */
- uint32_t fn;
- /*! time at which we last processed FN */
- struct timespec tv;
- } last_fn_timer;
- struct {
- /*! last FN we received a clock indication for */
- uint32_t fn;
- /*! time at which we received the last clock indication */
- struct timespec tv;
- } last_clk_ind;
- /*! Osmocom FD wrapper for timerfd */
- struct osmo_fd fn_timer_ofd;
-};
-
-/* TODO: This must go
Change in ...osmo-bts[master]: struct gsm_bts: Add mode_priv pointer handing bts_model specific data
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/15613
Change subject: struct gsm_bts: Add mode_priv pointer handing bts_model
specific data
..
struct gsm_bts: Add mode_priv pointer handing bts_model specific data
Existing model specific data is moved there.
Change-Id: Ib17a752cdbaa7d5eb8c5dfa0b197f80a4f38b38e
---
M include/osmo-bts/gsm_data_shared.h
M src/osmo-bts-oc2g/l1_if.h
M src/osmo-bts-oc2g/main.c
M src/osmo-bts-virtual/l1_if.h
M src/osmo-bts-virtual/main.c
M src/osmo-bts-virtual/scheduler_virtbts.c
6 files changed, 33 insertions(+), 24 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/13/15613/1
diff --git a/include/osmo-bts/gsm_data_shared.h
b/include/osmo-bts/gsm_data_shared.h
index cf7b715..5d8bc76 100644
--- a/include/osmo-bts/gsm_data_shared.h
+++ b/include/osmo-bts/gsm_data_shared.h
@@ -775,19 +775,7 @@
char *sock_path;
} pcu;
- struct {
- uint32_t last_fn;
- struct timeval tv_clock;
- struct osmo_timer_list fn_timer;
- } vbts;
-#ifdef ENABLE_OC2GBTS
-/* specific to Open Cellular 2G BTS */
-struct {
-uint8_t led_ctrl_mode; /* 0:
control by BTS, 1: not control by BTS */
-struct llist_head ceased_alarm_list;/* ceased alarm list*/
-unsigned int rtp_drift_thres_ms;/* RTP
timestamp drift detection threshold */
-} oc2g;
-#endif
+ void *model_priv; /* Allocated by bts_model, contains model specific
data pointer */
};
diff --git a/src/osmo-bts-oc2g/l1_if.h b/src/osmo-bts-oc2g/l1_if.h
index 38699e0..11b2c1f 100644
--- a/src/osmo-bts-oc2g/l1_if.h
+++ b/src/osmo-bts-oc2g/l1_if.h
@@ -30,6 +30,13 @@
_NUM_MQ_WRITE
};
+/* gsm_bts->model_priv, specific to Open Cellular 2G BTS */
+struct bts_oc2g_priv {
+ uint8_t led_ctrl_mode; /* 0: control
by BTS, 1: not control by BTS */
+ struct llist_head ceased_alarm_list;/* ceased alarm list*/
+ unsigned int rtp_drift_thres_ms;/* RTP timestamp drift
detection threshold */
+}
+
struct calib_send_state {
FILE *fp;
const char *path;
diff --git a/src/osmo-bts-oc2g/main.c b/src/osmo-bts-oc2g/main.c
index 5b66c6f..7149edb 100644
--- a/src/osmo-bts-oc2g/main.c
+++ b/src/osmo-bts-oc2g/main.c
@@ -87,15 +87,17 @@
static struct osmo_fd accept_fd, read_fd;
int rc;
+ struct bts_oc2g_priv *bts_oc2g = talloc_zero(bts, struct bts_oc2g_priv);
+ bts->model_priv = bts_oc2g;
bts->variant = BTS_OSMO_OC2G;
bts->support.ciphers = CIPHER_A5(1) | CIPHER_A5(2) | CIPHER_A5(3);
/* specific default values for OC2G platform */
/* TODO(oramadan) MERGE
- bts->oc2g.led_ctrl_mode = OC2G_BTS_LED_CTRL_MODE_DEFAULT;
+ bts_oc2g->led_ctrl_mode = OC2G_BTS_LED_CTRL_MODE_DEFAULT;
*/
/* RTP drift threshold default */
- /* bts->oc2g.rtp_drift_thres_ms = OC2G_BTS_RTP_DRIFT_THRES_DEFAULT; */
+ /* bts_oc2g->rtp_drift_thres_ms = OC2G_BTS_RTP_DRIFT_THRES_DEFAULT; */
rc = oml_router_init(bts, OML_ROUTER_PATH, _fd, _fd);
if (rc < 0) {
diff --git a/src/osmo-bts-virtual/l1_if.h b/src/osmo-bts-virtual/l1_if.h
index 6a843b3..075856f 100644
--- a/src/osmo-bts-virtual/l1_if.h
+++ b/src/osmo-bts-virtual/l1_if.h
@@ -5,6 +5,13 @@
#include "virtual_um.h"
+/* gsm_bts->model_priv, specific to osmo-bts-virtual */
+struct bts_virt_priv {
+ uint32_t last_fn;
+ struct timeval tv_clock;
+ struct osmo_timer_list fn_timer;
+};
+
struct vbts_l1h {
struct gsm_bts_trx *trx;
struct l1sched_trx l1s;
diff --git a/src/osmo-bts-virtual/main.c b/src/osmo-bts-virtual/main.c
index aa1c608..c329f3a 100644
--- a/src/osmo-bts-virtual/main.c
+++ b/src/osmo-bts-virtual/main.c
@@ -47,6 +47,7 @@
#include
#include
#include "virtual_um.h"
+#include "l1_if.h"
/* dummy, since no direct dsp support */
uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx)
@@ -56,6 +57,8 @@
int bts_model_init(struct gsm_bts *bts)
{
+ struct bts_virt_priv *bts_virt = talloc_zero(bts, struct bts_virt_priv);
+ bts->model_priv = bts_virt;
bts->variant = BTS_OSMO_VIRTUAL;
bts->support.ciphers = CIPHER_A5(1) | CIPHER_A5(2) | CIPHER_A5(3);
diff --git a/src/osmo-bts-virtual/scheduler_virtbts.c
b/src/osmo-bts-virtual/scheduler_virtbts.c
index 259a573..3c934b1 100644
--- a/src/osmo-bts-virtual/scheduler_virtbts.c
+++ b/src/osmo-bts-virtual/scheduler_virtbts.c
@@ -562,8 +562,9 @@
static void vbts_fn_timer_cb(void *data)
{
struct gsm_bts *bts = data;
+ struct bts_virt_priv *bts_virt = (struct bts_virt_priv
*)bts->model_priv;
struct timeval tv_now;
- struct timeval *tv_clock = >vbts.tv_clock;
+ struct
Change in ...osmo-bts[master]: bts-trx: Move transceiver_available as part of bts-trx private data
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/15615
Change subject: bts-trx: Move transceiver_available as part of bts-trx private
data
..
bts-trx: Move transceiver_available as part of bts-trx private data
Change-Id: I35f4697bd33dbe8a4c76c9500b82c16589c701d4
---
M src/osmo-bts-trx/l1_if.c
M src/osmo-bts-trx/l1_if.h
M src/osmo-bts-trx/scheduler_trx.c
M src/osmo-bts-trx/trx_if.c
M src/osmo-bts-trx/trx_if.h
M src/osmo-bts-trx/trx_vty.c
6 files changed, 37 insertions(+), 15 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/15/15615/1
diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c
index cd2a03c..fb75116 100644
--- a/src/osmo-bts-trx/l1_if.c
+++ b/src/osmo-bts-trx/l1_if.c
@@ -186,11 +186,28 @@
int l1if_provision_transceiver_trx(struct trx_l1h *l1h)
{
uint8_t tn;
+ struct phy_link *plink;
+ struct gsm_bts *bts;
+ struct bts_trx_priv *bts_trx;
struct phy_instance *pinst = l1h->phy_inst;
- struct phy_link *plink = pinst->phy_link;
- if (!transceiver_available)
+ /* During setup, pinst may still not be associated to a TRX nr */
+ if (!pinst->trx) {
+ LOGPPHI(pinst, DL1C, LOGL_INFO,
+ "Delaying provision, TRX not yet assigned to phy
instance\n");
return -EIO;
+ }
+
+ bts = pinst->trx->bts;
+ bts_trx = (struct bts_trx_priv *)bts->model_priv;
+
+ if (!bts_trx->available) {
+ LOGPPHI(pinst, DL1C, LOGL_INFO,
+ "Delaying provision, TRX not yet available\n");
+ return -EIO;
+ }
+
+ plink = pinst->phy_link;
if (l1h->config.poweron
&& l1h->config.tsc_valid
@@ -371,6 +388,7 @@
/* set bts attributes */
static uint8_t trx_set_bts(struct gsm_bts *bts, struct tlv_parsed *new_attr)
{
+ struct bts_trx_priv *bts_trx = (struct bts_trx_priv *)bts->model_priv;
struct gsm_bts_trx *trx;
uint8_t bsic = bts->bsic;
@@ -384,7 +402,7 @@
l1if_provision_transceiver_trx(l1h);
}
}
- check_transceiver_availability(bts, transceiver_available);
+ check_transceiver_availability(bts, bts_trx->available);
return 0;
diff --git a/src/osmo-bts-trx/l1_if.h b/src/osmo-bts-trx/l1_if.h
index 29bd246..b2eb404 100644
--- a/src/osmo-bts-trx/l1_if.h
+++ b/src/osmo-bts-trx/l1_if.h
@@ -46,6 +46,7 @@
/* gsm_bts->model_priv, specific to osmo-bts-trx */
struct bts_trx_priv {
+ bool available;
struct osmo_trx_clock_state clk_s;
};
diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c
index 6c3a8ff..51050fa 100644
--- a/src/osmo-bts-trx/scheduler_trx.c
+++ b/src/osmo-bts-trx/scheduler_trx.c
@@ -1677,7 +1677,7 @@
no_clock:
osmo_timerfd_disable(>fn_timer_ofd);
- transceiver_available = 0;
+ bts_trx->available = false;
bts_shutdown(bts, "No clock from osmo-trx");
@@ -1724,10 +1724,10 @@
clock_gettime(CLOCK_MONOTONIC, _now);
/* clock becomes valid */
- if (!transceiver_available) {
+ if (!bts_trx->available) {
LOGP(DL1C, LOGL_NOTICE, "initial GSM clock received: fn=%u\n",
fn);
- transceiver_available = 1;
+ bts_trx->available = true;
/* start provisioning transceiver */
l1if_provision_transceiver(bts);
diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c
index 166cfe6..ccece15 100644
--- a/src/osmo-bts-trx/trx_if.c
+++ b/src/osmo-bts-trx/trx_if.c
@@ -48,8 +48,6 @@
#include "l1_if.h"
#include "trx_if.h"
-int transceiver_available = 0;
-
/*
* socket helper functions
*/
@@ -196,12 +194,14 @@
static int trx_ctrl_cmd_cb(struct trx_l1h *l1h, int critical, void *cb, const
char *cmd,
const char *fmt, ...)
{
+ struct gsm_bts *bts = l1h->phy_inst->trx->bts;
+ struct bts_trx_priv *bts_trx = (struct bts_trx_priv *)bts->model_priv;
struct trx_ctrl_msg *tcm;
struct trx_ctrl_msg *prev = NULL;
va_list ap;
int pending;
- if (!transceiver_available &&
+ if (!bts_trx->available &&
!(!strcmp(cmd, "POWEROFF") || !strcmp(cmd, "POWERON"))) {
LOGPPHI(l1h->phy_inst, DTRX, LOGL_ERROR, "CTRL %s ignored: No
clock from "
"transceiver, please fix!\n", cmd);
@@ -1054,6 +1054,8 @@
int trx_if_send_burst(struct trx_l1h *l1h, uint8_t tn, uint32_t fn, uint8_t
pwr,
const ubit_t *bits, uint16_t nbits)
{
+ struct gsm_bts *bts = l1h->phy_inst->trx->bts;
+ struct bts_trx_priv *bts_trx = (struct bts_trx_priv *)bts->model_priv;
uint8_t hdr_ver = l1h->config.trxd_hdr_ver_use;
uint8_t buf[TRX_DATA_MSG_MAX_LEN];
@@ -1090,7 +1092,7 @@
/* we must be sure that we have clock, and we
Change in ...osmo-bts[master]: gitignore: add oc2g generated files
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15612 ) Change subject: gitignore: add oc2g generated files .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15612 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3e7af6d290988099535bab63bbc53a901d16b55f Gerrit-Change-Number: 15612 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 27 Sep 2019 14:37:27 + 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 4: (1 comment) This change is ready for review. https://gerrit.osmocom.org/#/c/15550/3/src/common/vty.c File src/common/vty.c: https://gerrit.osmocom.org/#/c/15550/3/src/common/vty.c@1606 PS3, Line 1606: #define L1_SAPI_CMD_STR "logging filter l1-sapi (rach|agch|pch|bcch|pdtch|prach|ptcch|agch_dt)" > this probably needs updating? Also, the string names can actually be > generated, as you already have […] Done -- 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: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 27 Sep 2019 13:35:08 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment
Change in ...osmo-bts[master]: log: set L1 SAPI log context
osmith has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/15539 )
Change subject: log: set L1 SAPI log context
..
Patch Set 6: -Code-Review
(5 comments)
Updated.
Now only the TTCN-3 test needs to be updated; therefore I'll set this to WIP
again. The TTCN-3 test does not pass since the rewrite in patchset 5, because
we are not setting the log context as soon as a message from the PCU socket
arrives. It gets set at a later point now, before sending the data to the BTS
specific code.
https://gerrit.osmocom.org/#/c/15539/5/src/common/l1sap.c
File src/common/l1sap.c:
https://gerrit.osmocom.org/#/c/15539/5/src/common/l1sap.c@329
PS5, Line 329: switch(OSMO_PRIM_HDR(>oph)) {
> cosmetic: 'switch' is not a function
Done
https://gerrit.osmocom.org/#/c/15539/5/src/osmo-bts-litecell15/l1_if.c
File src/osmo-bts-litecell15/l1_if.c:
https://gerrit.osmocom.org/#/c/15539/5/src/osmo-bts-litecell15/l1_if.c@801
PS5, Line 801: case GsmL1_Sapi_Idle:
> a 'const' look-up table indexed by GsmL1_Sapi would be faster, as it's not
> going to traverse dozens […]
Done
https://gerrit.osmocom.org/#/c/15539/5/src/osmo-bts-oc2g/l1_if.c
File src/osmo-bts-oc2g/l1_if.c:
https://gerrit.osmocom.org/#/c/15539/5/src/osmo-bts-oc2g/l1_if.c@852
PS5, Line 852: switch(sapi) {
> same here regarding the lookup table approach.
Done
https://gerrit.osmocom.org/#/c/15539/5/src/osmo-bts-octphy/l1_if.c
File src/osmo-bts-octphy/l1_if.c:
https://gerrit.osmocom.org/#/c/15539/5/src/osmo-bts-octphy/l1_if.c@943
PS5, Line 943: switch(sapi) {
> again same...
Done
https://gerrit.osmocom.org/#/c/15539/5/src/osmo-bts-sysmo/l1_if.c
File src/osmo-bts-sysmo/l1_if.c:
https://gerrit.osmocom.org/#/c/15539/5/src/osmo-bts-sysmo/l1_if.c@803
PS5, Line 803: return L1SAP_COMMON_SAPI_IDLE;
> ...
Done
--
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: 6
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: Fri, 27 Sep 2019 13:34:07 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: laforge
Gerrit-MessageType: comment
Change in ...osmo-bts[master]: gitignore: add oc2g generated files
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/15612 Change subject: gitignore: add oc2g generated files .. gitignore: add oc2g generated files Change-Id: I3e7af6d290988099535bab63bbc53a901d16b55f --- M .gitignore 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/12/15612/1 diff --git a/.gitignore b/.gitignore index 305553f..a4b794a 100644 --- a/.gitignore +++ b/.gitignore @@ -47,6 +47,11 @@ src/osmo-bts-virtual/osmo-bts-virtual src/osmo-bts-omldummy/osmo-bts-omldummy +src/osmo-bts-oc2g/osmo-bts-oc2g +src/osmo-bts-oc2g/oc2gbts-mgr +src/osmo-bts-oc2g/oc2gbts-util +src/osmo-bts-oc2g/misc/.dirstamp + tests/atconfig tests/package.m4 tests/agch/agch_test -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15612 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3e7af6d290988099535bab63bbc53a901d16b55f Gerrit-Change-Number: 15612 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
Change in ...osmo-bts[master]: bts.h: Remove non-existent function definitions
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/15611 Change subject: bts.h: Remove non-existent function definitions .. bts.h: Remove non-existent function definitions Change-Id: I4d06e1cdea5970cbb493f29980b1c04e01c0e8a4 --- M include/osmo-bts/bts.h 1 file changed, 0 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/11/15611/1 diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index 4d13214..5c719f9 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -30,16 +30,9 @@ int bts_trx_init(struct gsm_bts_trx *trx); void bts_shutdown(struct gsm_bts *bts, const char *reason); -struct gsm_bts *create_bts(uint8_t num_trx, char *id); -int create_ms(struct gsm_bts_trx *trx, int maskc, uint8_t *maskv_tx, - uint8_t *maskv_rx); -void destroy_bts(struct gsm_bts *bts); -int work_bts(struct gsm_bts *bts); int bts_link_estab(struct gsm_bts *bts); int trx_link_estab(struct gsm_bts_trx *trx); int trx_set_available(struct gsm_bts_trx *trx, int avail); -void bts_new_si(void *arg); -void bts_setup_slot(struct gsm_bts_trx_ts *slot, uint8_t comb); int bts_agch_enqueue(struct gsm_bts *bts, struct msgb *msg); struct msgb *bts_agch_dequeue(struct gsm_bts *bts); @@ -68,4 +61,3 @@ int32_t bts_get_avg_fn_advance(struct gsm_bts *bts); #endif /* _BTS_H */ - -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15611 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4d06e1cdea5970cbb493f29980b1c04e01c0e8a4 Gerrit-Change-Number: 15611 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in ...osmo-bts[master]: bts-trx: vty: Use API to get poweron state
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/15610 Change subject: bts-trx: vty: Use API to get poweron state .. bts-trx: vty: Use API to get poweron state Change-Id: I8b78e1ad34f19d8fe348b9c975742fc0f7112da2 --- M src/osmo-bts-trx/trx_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/10/15610/1 diff --git a/src/osmo-bts-trx/trx_vty.c b/src/osmo-bts-trx/trx_vty.c index c52908e..250d180 100644 --- a/src/osmo-bts-trx/trx_vty.c +++ b/src/osmo-bts-trx/trx_vty.c @@ -71,7 +71,7 @@ vty_out(vty, "TRX %d %s%s", trx->nr, sname, VTY_NEWLINE); talloc_free(sname); vty_out(vty, " %s%s", - (l1h->config.poweron) ? "poweron":"poweroff", + trx_if_powered(l1h) ? "poweron":"poweroff", VTY_NEWLINE); if (l1h->config.arfcn_valid) vty_out(vty, " arfcn : %d%s%s", -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15610 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8b78e1ad34f19d8fe348b9c975742fc0f7112da2 Gerrit-Change-Number: 15610 Gerrit-PatchSet: 1 Gerrit-Owner: pespin 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: [ 703s] ar: `u' modifier ignored since `D' is the default (see `U') [ 703s] libtool: link: ranlib .libs/libtransceiver_common.a [ 703s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 703s] /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 [ 704s] 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 [ 704s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 704s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 704s] collect2: error: ld returned 1 exit status [ 704s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 704s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 704s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 704s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 704s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 704s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 704s] make[1]: *** [Makefile:444: all] Error 2 [ 704s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 704s] dh_auto_build: make -j1 returned exit code 2 [ 704s] make: *** [debian/rules:6: build] Error 255 [ 704s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 704s] [ 704s] lamb19 failed "build osmo-trx_1.1.1.28.ee2b.dsc" at Fri Sep 27 11:36:42 UTC 2019. [ 704s] [ 704s] ### VM INTERACTION START ### [ 707s] [ 684.327993] sysrq: SysRq : Power Off [ 707s] [ 684.344704] reboot: Power down [ 707s] ### VM INTERACTION END ### [ 707s] [ 707s] lamb19 failed "build osmo-trx_1.1.1.28.ee2b.dsc" at Fri Sep 27 11:36:45 UTC 2019. [ 707s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/)
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: [ 959s] ar: `u' modifier ignored since `D' is the default (see `U') [ 959s] libtool: link: ranlib .libs/libtransceiver_common.a [ 959s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 959s] /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 [ 960s] 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 [ 960s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 960s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 960s] collect2: error: ld returned 1 exit status [ 960s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 960s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 960s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 960s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 960s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 960s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 960s] make[1]: *** [Makefile:444: all] Error 2 [ 960s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 960s] dh_auto_build: make -j1 returned exit code 2 [ 960s] make: *** [debian/rules:6: build] Error 255 [ 960s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 960s] [ 960s] lamb18 failed "build osmo-trx_1.1.1.dsc" at Fri Sep 27 11:32:13 UTC 2019. [ 960s] [ 960s] ### VM INTERACTION START ### [ 964s] [ 936.842132] sysrq: SysRq : Power Off [ 964s] [ 936.975559] reboot: Power down [ 964s] ### VM INTERACTION END ### [ 964s] [ 964s] lamb18 failed "build osmo-trx_1.1.1.dsc" at Fri Sep 27 11:32:17 UTC 2019. [ 964s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/)
Change in ...osmo-pcu[master]: tbf_dl.cpp: Remove dup call to tbf_update_ms_class() in state GPRS_RL...
pespin has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-pcu/+/15604 )
Change subject: tbf_dl.cpp: Remove dup call to tbf_update_ms_class() in state
GPRS_RLCMAC_WAIT_RELEASE
..
tbf_dl.cpp: Remove dup call to tbf_update_ms_class() in state
GPRS_RLCMAC_WAIT_RELEASE
tbf_update_ms_class() is already called two lines above in the common
path.
Fixes: 409efa1ec84c14aaa43bfac85ba4956e9f3cf16a
Change-Id: Icbe3805c72a5c77366215be55128b586e5a00fb7
---
M src/tbf_dl.cpp
1 file changed, 0 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
osmith: Looks good to me, approved
diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp
index 23887d1..4efb5a4 100644
--- a/src/tbf_dl.cpp
+++ b/src/tbf_dl.cpp
@@ -123,7 +123,6 @@
if (state_is(GPRS_RLCMAC_WAIT_RELEASE)) {
LOGPTBFDL(this, LOGL_DEBUG, "in WAIT RELEASE state (T3193), so
reuse TBF\n");
- tbf_update_ms_class(this, ms_class);
establish_dl_tbf_on_pacch();
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15604
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: Icbe3805c72a5c77366215be55128b586e5a00fb7
Gerrit-Change-Number: 15604
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...osmo-pcu[master]: tbf_dl: Setup m_llc_timer in constructor using osmocom API
pespin has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-pcu/+/15606 )
Change subject: tbf_dl: Setup m_llc_timer in constructor using osmocom API
..
tbf_dl: Setup m_llc_timer in constructor using osmocom API
Change-Id: I3e761b319326e33ab1d56c4fb30cafe3b0f96c29
---
M src/tbf_dl.cpp
1 file changed, 1 insertion(+), 5 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp
index fdd9ba3..23887d1 100644
--- a/src/tbf_dl.cpp
+++ b/src/tbf_dl.cpp
@@ -87,6 +87,7 @@
m_dl_egprs_ctrs(NULL)
{
memset(_llc_timer, 0, sizeof(m_llc_timer));
+ osmo_timer_setup(_llc_timer, llc_timer_cb, this);
}
void gprs_rlcmac_dl_tbf::cleanup()
@@ -98,11 +99,6 @@
{
if (bts_data()->llc_idle_ack_csec > 0) {
struct timeval tv;
-
- /* TODO: this ought to be within a constructor */
- m_llc_timer.data = this;
- m_llc_timer.cb = _timer_cb;
-
csecs_to_timeval(bts_data()->llc_idle_ack_csec, );
osmo_timer_schedule(_llc_timer, tv.tv_sec, tv.tv_usec);
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15606
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I3e761b319326e33ab1d56c4fb30cafe3b0f96c29
Gerrit-Change-Number: 15606
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...osmo-pcu[master]: vty: Fix osmo_tdef timers not listed in write config
pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15608 ) Change subject: vty: Fix osmo_tdef timers not listed in write config .. vty: Fix osmo_tdef timers not listed in write config Change-Id: I5c7ae18919e4b016505aa01eea6694d8a3f5df5f --- M src/pcu_vty.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/src/pcu_vty.c b/src/pcu_vty.c index 6592cae..c47c896 100644 --- a/src/pcu_vty.c +++ b/src/pcu_vty.c @@ -271,6 +271,8 @@ else vty_out(vty, " gb-dialect classic%s", VTY_NEWLINE); + osmo_tdef_vty_write(vty, bts->T_defs_pcu, " timer "); + return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15608 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5c7ae18919e4b016505aa01eea6694d8a3f5df5f Gerrit-Change-Number: 15608 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in ...osmo-pcu[master]: Move tbf_{dl, ul} child constructors to respective .cpp files
pespin has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-pcu/+/15605 )
Change subject: Move tbf_{dl,ul} child constructors to respective .cpp files
..
Move tbf_{dl,ul} child constructors to respective .cpp files
Fixes: 9d1cdb1f697057033394590a9b2815efe6c08cd9
Change-Id: Id258589d46de42ad4e27889bc396f930b7f94b79
---
M src/tbf.cpp
M src/tbf_dl.cpp
M src/tbf_ul.cpp
3 files changed, 24 insertions(+), 24 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
diff --git a/src/tbf.cpp b/src/tbf.cpp
index 3ca39bf..389b186 100644
--- a/src/tbf.cpp
+++ b/src/tbf.cpp
@@ -955,17 +955,6 @@
return 0;
}
-gprs_rlcmac_ul_tbf::gprs_rlcmac_ul_tbf(BTS *bts_) :
- gprs_rlcmac_tbf(bts_, GPRS_RLCMAC_UL_TBF),
- m_rx_counter(0),
- m_contention_resolution_done(0),
- m_final_ack_sent(0),
- m_ul_gprs_ctrs(NULL),
- m_ul_egprs_ctrs(NULL)
-{
- memset(_usf, 0, sizeof(m_usf));
-}
-
static int ul_tbf_dtor(struct gprs_rlcmac_ul_tbf *tbf)
{
tbf->~gprs_rlcmac_ul_tbf();
@@ -1054,19 +1043,6 @@
timespecclear(_loss_tv);
}
-gprs_rlcmac_dl_tbf::gprs_rlcmac_dl_tbf(BTS *bts_) :
- gprs_rlcmac_tbf(bts_, GPRS_RLCMAC_DL_TBF),
- m_tx_counter(0),
- m_wait_confirm(0),
- m_dl_ack_requested(false),
- m_last_dl_poll_fn(0),
- m_last_dl_drained_fn(0),
- m_dl_gprs_ctrs(NULL),
- m_dl_egprs_ctrs(NULL)
-{
- memset(_llc_timer, 0, sizeof(m_llc_timer));
-}
-
static int dl_tbf_dtor(struct gprs_rlcmac_dl_tbf *tbf)
{
tbf->~gprs_rlcmac_dl_tbf();
diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp
index e9190f6..fdd9ba3 100644
--- a/src/tbf_dl.cpp
+++ b/src/tbf_dl.cpp
@@ -76,6 +76,19 @@
tbf->request_dl_ack();
}
+gprs_rlcmac_dl_tbf::gprs_rlcmac_dl_tbf(BTS *bts_) :
+ gprs_rlcmac_tbf(bts_, GPRS_RLCMAC_DL_TBF),
+ m_tx_counter(0),
+ m_wait_confirm(0),
+ m_dl_ack_requested(false),
+ m_last_dl_poll_fn(0),
+ m_last_dl_drained_fn(0),
+ m_dl_gprs_ctrs(NULL),
+ m_dl_egprs_ctrs(NULL)
+{
+ memset(_llc_timer, 0, sizeof(m_llc_timer));
+}
+
void gprs_rlcmac_dl_tbf::cleanup()
{
osmo_timer_del(_llc_timer);
diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp
index a993cce..9e3773c 100644
--- a/src/tbf_ul.cpp
+++ b/src/tbf_ul.cpp
@@ -55,6 +55,17 @@
extern void *tall_pcu_ctx;
+gprs_rlcmac_ul_tbf::gprs_rlcmac_ul_tbf(BTS *bts_) :
+ gprs_rlcmac_tbf(bts_, GPRS_RLCMAC_UL_TBF),
+ m_rx_counter(0),
+ m_contention_resolution_done(0),
+ m_final_ack_sent(0),
+ m_ul_gprs_ctrs(NULL),
+ m_ul_egprs_ctrs(NULL)
+{
+ memset(_usf, 0, sizeof(m_usf));
+}
+
/*
* Store received block data in LLC message(s) and forward to SGSN
* if complete.
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15605
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: Id258589d46de42ad4e27889bc396f930b7f94b79
Gerrit-Change-Number: 15605
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...osmo-ttcn3-hacks[master]: PCU_Tests_RAW.ttcn: add test case for UL link quality adaptation
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15526 ) Change subject: PCU_Tests_RAW.ttcn: add test case for UL link quality adaptation .. Patch Set 4: > Patch Set 4: > > FYI, this test is failing in jenkins: > https://jenkins.osmocom.org/jenkins/view/TTCN3/job/ttcn3-pcu-test/test_results_analyzer/ > > I'm not sure if that is expected. The other new test passes. Yep, it fails on my machine too. For some reason, OsmoPCU changes coding scheme later than expected: DRLCMACMEAS INFO MS (IMSI ): Link quality 12dB (10dB) left window [5, 8], modifying uplink CS level: CS-2 -> CS-3 (gprs_ms.cpp:684) Either this is a bug, or the test expectations are wrong... This "12dB (10dB)" also looks odd. -- 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: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 27 Sep 2019 06:49:59 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-pcu[master]: tbf_dl.cpp: Remove dup call to tbf_update_ms_class() in state GPRS_RL...
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15604 ) Change subject: tbf_dl.cpp: Remove dup call to tbf_update_ms_class() in state GPRS_RLCMAC_WAIT_RELEASE .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15604 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Icbe3805c72a5c77366215be55128b586e5a00fb7 Gerrit-Change-Number: 15604 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 27 Sep 2019 06:42:30 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-pcu[master]: vty: Fix osmo_tdef timers not listed in write config
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15608 ) Change subject: vty: Fix osmo_tdef timers not listed in write config .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15608 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5c7ae18919e4b016505aa01eea6694d8a3f5df5f Gerrit-Change-Number: 15608 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 27 Sep 2019 06:42:54 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-pcu[master]: tbf_dl: Setup m_llc_timer in constructor using osmocom API
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15606 ) Change subject: tbf_dl: Setup m_llc_timer in constructor using osmocom API .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I3e761b319326e33ab1d56c4fb30cafe3b0f96c29 Gerrit-Change-Number: 15606 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 27 Sep 2019 06:41:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-pcu[master]: Move tbf_{dl, ul} child constructors to respective .cpp files
osmith has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-pcu/+/15605 )
Change subject: Move tbf_{dl,ul} child constructors to respective .cpp files
..
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15605
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: Id258589d46de42ad4e27889bc396f930b7f94b79
Gerrit-Change-Number: 15605
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Comment-Date: Fri, 27 Sep 2019 06:40:14 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: PCU_Tests_RAW.ttcn: add test case for UL link quality adaptation
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15526 ) Change subject: PCU_Tests_RAW.ttcn: add test case for UL link quality adaptation .. Patch Set 4: FYI, this test is failing in jenkins: https://jenkins.osmocom.org/jenkins/view/TTCN3/job/ttcn3-pcu-test/test_results_analyzer/ I'm not sure if that is expected. The other new test passes. -- 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: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 27 Sep 2019 06:35:24 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
