subject:"osmo\-trx\[master\]\: Depend on libosmocore"

osmo-trx[master]: Depend on libosmocore

2018-02-22 Thread Harald Welte


Patch Set 9: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/6618
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If345c89293fcd7d1ad4f17214eea339951f25a5d
Gerrit-PatchSet: 9
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-HasComments: No

[MERGED] osmo-trx[master]: Depend on libosmocore

2018-02-22 Thread Harald Welte

Harald Welte has submitted this change and it was merged.

Change subject: Depend on libosmocore
..


Depend on libosmocore

Change-Id: If345c89293fcd7d1ad4f17214eea339951f25a5d
---
M Transceiver52M/Makefile.am
M configure.ac
M contrib/jenkins.sh
3 files changed, 33 insertions(+), 5 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am
index f36f4d4..21104dc 100644
--- a/Transceiver52M/Makefile.am
+++ b/Transceiver52M/Makefile.am
@@ -22,7 +22,7 @@
 include $(top_srcdir)/Makefile.common
 
 AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/common
-AM_CXXFLAGS = -lpthread
+AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS)
 
 SUBDIRS = arm x86
 
@@ -92,7 +92,8 @@
$(ARCH_LA) \
$(GSM_LA) \
$(COMMON_LA) \
-   $(FFTWF_LIBS)
+   $(FFTWF_LIBS) \
+   $(LIBOSMOCORE_LIBS)
 
 if USRP1
 libtransceiver_la_SOURCES += USRPDevice.cpp
diff --git a/configure.ac b/configure.ac
index 5c034e5..cba4a0c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,6 +73,8 @@
 AC_HEADER_TIME
 AC_C_BIGENDIAN
 
+PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.10.0)
+
 AC_ARG_WITH(usrp1, [
 AS_HELP_STRING([--with-usrp1],
 [enable USRP1 gnuradio based transceiver])
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 11def5c..cee709d 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -15,6 +15,11 @@
 mychroot_nocwd -w / "$@"
 }
 
+base="$PWD"
+deps="$base/deps"
+inst="$deps/install"
+export deps inst
+
 if [ -z "${INSIDE_CHROOT}" ]; then
 
 osmo-clean-workspace.sh
@@ -41,16 +46,36 @@
 echo "nameserver 8.8.8.8" > 
"$ROOTFS/etc/resolv.conf"
 fi
 mychroot -b /dev apt-get update
-mychroot apt-get -y install build-essential 
dh-autoreconf pkg-config libuhd-dev libusb-1.0-0-dev libusb-dev git
+mychroot apt-get -y install build-essential 
dh-autoreconf pkg-config libuhd-dev libusb-1.0-0-dev libusb-dev git 
libtalloc-dev libgnutls28-dev stow
 fi
 # Run jenkins.sh inside the chroot:
-INSIDE_CHROOT=1 mychroot_nocwd -w /osmo-trx -b 
"$OSMOTRX_DIR:/osmo-trx" -b "$(which 
osmo-clean-workspace.sh):/usr/bin/osmo-clean-workspace.sh" ./contrib/jenkins.sh
+INSIDE_CHROOT=1 mychroot_nocwd \
+ -w /osmo-trx \
+ -b "$OSMOTRX_DIR:/osmo-trx" \
+ -b "$(which 
osmo-clean-workspace.sh):/usr/bin/osmo-clean-workspace.sh" \
+ -b "$(which osmo-build-dep.sh):/usr/bin/osmo-build-dep.sh" \
+ -b "$(which osmo-deps.sh):/usr/bin/osmo-deps.sh" \
+  ./contrib/jenkins.sh
 exit 0
 fi
 fi
 
-### BUILD osmo-trx
+mkdir "$deps" || true
 
+osmo-build-dep.sh libosmocore "" "--disable-doxygen --disable-pcsc"
+
+export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
+export LD_LIBRARY_PATH="$inst/lib"
+
+set +x
+echo
+echo
+echo
+echo " === osmo-trx 
==="
+echo
+set -x
+
+cd "$base"
 autoreconf --install --force
 ./configure $INSTR
 $MAKE $PARALLEL_MAKE

-- 
To view, visit https://gerrit.osmocom.org/6618
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If345c89293fcd7d1ad4f17214eea339951f25a5d
Gerrit-PatchSet: 9
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy

[PATCH] osmo-trx[master]: Depend on libosmocore

2018-02-22 Thread Pau Espin Pedrol

Hello Vadim Yanitskiy, Jenkins Builder,

I'd like you to reexamine a change.  Please visit

https://gerrit.osmocom.org/6618

to look at the new patch set (#9).

Depend on libosmocore

Change-Id: If345c89293fcd7d1ad4f17214eea339951f25a5d
---
M Transceiver52M/Makefile.am
M configure.ac
M contrib/jenkins.sh
3 files changed, 33 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/18/6618/9

diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am
index f36f4d4..21104dc 100644
--- a/Transceiver52M/Makefile.am
+++ b/Transceiver52M/Makefile.am
@@ -22,7 +22,7 @@
 include $(top_srcdir)/Makefile.common
 
 AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/common
-AM_CXXFLAGS = -lpthread
+AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS)
 
 SUBDIRS = arm x86
 
@@ -92,7 +92,8 @@
$(ARCH_LA) \
$(GSM_LA) \
$(COMMON_LA) \
-   $(FFTWF_LIBS)
+   $(FFTWF_LIBS) \
+   $(LIBOSMOCORE_LIBS)
 
 if USRP1
 libtransceiver_la_SOURCES += USRPDevice.cpp
diff --git a/configure.ac b/configure.ac
index 5c034e5..cba4a0c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,6 +73,8 @@
 AC_HEADER_TIME
 AC_C_BIGENDIAN
 
+PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.10.0)
+
 AC_ARG_WITH(usrp1, [
 AS_HELP_STRING([--with-usrp1],
 [enable USRP1 gnuradio based transceiver])
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 11def5c..cee709d 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -15,6 +15,11 @@
 mychroot_nocwd -w / "$@"
 }
 
+base="$PWD"
+deps="$base/deps"
+inst="$deps/install"
+export deps inst
+
 if [ -z "${INSIDE_CHROOT}" ]; then
 
 osmo-clean-workspace.sh
@@ -41,16 +46,36 @@
 echo "nameserver 8.8.8.8" > 
"$ROOTFS/etc/resolv.conf"
 fi
 mychroot -b /dev apt-get update
-mychroot apt-get -y install build-essential 
dh-autoreconf pkg-config libuhd-dev libusb-1.0-0-dev libusb-dev git
+mychroot apt-get -y install build-essential 
dh-autoreconf pkg-config libuhd-dev libusb-1.0-0-dev libusb-dev git 
libtalloc-dev libgnutls28-dev stow
 fi
 # Run jenkins.sh inside the chroot:
-INSIDE_CHROOT=1 mychroot_nocwd -w /osmo-trx -b 
"$OSMOTRX_DIR:/osmo-trx" -b "$(which 
osmo-clean-workspace.sh):/usr/bin/osmo-clean-workspace.sh" ./contrib/jenkins.sh
+INSIDE_CHROOT=1 mychroot_nocwd \
+ -w /osmo-trx \
+ -b "$OSMOTRX_DIR:/osmo-trx" \
+ -b "$(which 
osmo-clean-workspace.sh):/usr/bin/osmo-clean-workspace.sh" \
+ -b "$(which osmo-build-dep.sh):/usr/bin/osmo-build-dep.sh" \
+ -b "$(which osmo-deps.sh):/usr/bin/osmo-deps.sh" \
+  ./contrib/jenkins.sh
 exit 0
 fi
 fi
 
-### BUILD osmo-trx
+mkdir "$deps" || true
 
+osmo-build-dep.sh libosmocore "" "--disable-doxygen --disable-pcsc"
+
+export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
+export LD_LIBRARY_PATH="$inst/lib"
+
+set +x
+echo
+echo
+echo
+echo " === osmo-trx 
==="
+echo
+set -x
+
+cd "$base"
 autoreconf --install --force
 ./configure $INSTR
 $MAKE $PARALLEL_MAKE

-- 
To view, visit https://gerrit.osmocom.org/6618
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: If345c89293fcd7d1ad4f17214eea339951f25a5d
Gerrit-PatchSet: 9
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy

[PATCH] osmo-trx[master]: Depend on libosmocore

2018-02-22 Thread Pau Espin Pedrol

Hello Vadim Yanitskiy, Jenkins Builder,

I'd like you to reexamine a change.  Please visit

https://gerrit.osmocom.org/6618

to look at the new patch set (#6).

Depend on libosmocore

Change-Id: If345c89293fcd7d1ad4f17214eea339951f25a5d
---
M Transceiver52M/Makefile.am
M configure.ac
M contrib/jenkins.sh
3 files changed, 33 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/18/6618/6

diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am
index f36f4d4..21104dc 100644
--- a/Transceiver52M/Makefile.am
+++ b/Transceiver52M/Makefile.am
@@ -22,7 +22,7 @@
 include $(top_srcdir)/Makefile.common
 
 AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/common
-AM_CXXFLAGS = -lpthread
+AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS)
 
 SUBDIRS = arm x86
 
@@ -92,7 +92,8 @@
$(ARCH_LA) \
$(GSM_LA) \
$(COMMON_LA) \
-   $(FFTWF_LIBS)
+   $(FFTWF_LIBS) \
+   $(LIBOSMOCORE_LIBS)
 
 if USRP1
 libtransceiver_la_SOURCES += USRPDevice.cpp
diff --git a/configure.ac b/configure.ac
index 5c034e5..cba4a0c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,6 +73,8 @@
 AC_HEADER_TIME
 AC_C_BIGENDIAN
 
+PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.10.0)
+
 AC_ARG_WITH(usrp1, [
 AS_HELP_STRING([--with-usrp1],
 [enable USRP1 gnuradio based transceiver])
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 11def5c..9c13e2f 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -15,6 +15,11 @@
 mychroot_nocwd -w / "$@"
 }
 
+base="$PWD"
+deps="$base/deps"
+inst="$deps/install"
+export deps inst
+
 if [ -z "${INSIDE_CHROOT}" ]; then
 
 osmo-clean-workspace.sh
@@ -44,13 +49,34 @@
 mychroot apt-get -y install build-essential 
dh-autoreconf pkg-config libuhd-dev libusb-1.0-0-dev libusb-dev git
 fi
 # Run jenkins.sh inside the chroot:
-INSIDE_CHROOT=1 mychroot_nocwd -w /osmo-trx -b 
"$OSMOTRX_DIR:/osmo-trx" -b "$(which 
osmo-clean-workspace.sh):/usr/bin/osmo-clean-workspace.sh" ./contrib/jenkins.sh
+INSIDE_CHROOT=1 mychroot_nocwd \
+ -w /osmo-trx \
+ -b "$OSMOTRX_DIR:/osmo-trx" \
+ -b "$(which 
osmo-clean-workspace.sh):/usr/bin/osmo-clean-workspace.sh" \
+ -b "$(which osmo-build-dep.sh):/usr/bin/osmo-build-dep.sh" \
+  ./contrib/jenkins.sh
 exit 0
 fi
 fi
 
-### BUILD osmo-trx
+mkdir "$deps" || true
 
+osmo-build-dep.sh libosmocore "" --disable-doxygen
+
+verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]")
+
+export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
+export LD_LIBRARY_PATH="$inst/lib"
+
+set +x
+echo
+echo
+echo
+echo " === osmo-trx 
==="
+echo
+set -x
+
+cd "$base"
 autoreconf --install --force
 ./configure $INSTR
 $MAKE $PARALLEL_MAKE

-- 
To view, visit https://gerrit.osmocom.org/6618
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: If345c89293fcd7d1ad4f17214eea339951f25a5d
Gerrit-PatchSet: 6
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy

[PATCH] osmo-trx[master]: Depend on libosmocore

2018-02-21 Thread Pau Espin Pedrol

Hello Jenkins Builder,

I'd like you to reexamine a change.  Please visit

https://gerrit.osmocom.org/6618

to look at the new patch set (#5).

Depend on libosmocore

Change-Id: If345c89293fcd7d1ad4f17214eea339951f25a5d
---
M Transceiver52M/Makefile.am
M configure.ac
M contrib/jenkins.sh
3 files changed, 27 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/18/6618/5

diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am
index f36f4d4..21104dc 100644
--- a/Transceiver52M/Makefile.am
+++ b/Transceiver52M/Makefile.am
@@ -22,7 +22,7 @@
 include $(top_srcdir)/Makefile.common
 
 AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/common
-AM_CXXFLAGS = -lpthread
+AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS)
 
 SUBDIRS = arm x86
 
@@ -92,7 +92,8 @@
$(ARCH_LA) \
$(GSM_LA) \
$(COMMON_LA) \
-   $(FFTWF_LIBS)
+   $(FFTWF_LIBS) \
+   $(LIBOSMOCORE_LIBS)
 
 if USRP1
 libtransceiver_la_SOURCES += USRPDevice.cpp
diff --git a/configure.ac b/configure.ac
index 5c034e5..cba4a0c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,6 +73,8 @@
 AC_HEADER_TIME
 AC_C_BIGENDIAN
 
+PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.10.0)
+
 AC_ARG_WITH(usrp1, [
 AS_HELP_STRING([--with-usrp1],
 [enable USRP1 gnuradio based transceiver])
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 11def5c..5f1eed9 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -15,6 +15,11 @@
 mychroot_nocwd -w / "$@"
 }
 
+base="$PWD"
+deps="$base/deps"
+inst="$deps/install"
+export deps inst
+
 if [ -z "${INSIDE_CHROOT}" ]; then
 
 osmo-clean-workspace.sh
@@ -49,8 +54,24 @@
 fi
 fi
 
-### BUILD osmo-trx
+mkdir "$deps" || true
 
+osmo-build-dep.sh libosmocore "" --disable-doxygen
+
+verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]")
+
+export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
+export LD_LIBRARY_PATH="$inst/lib"
+
+set +x
+echo
+echo
+echo
+echo " === osmo-trx 
==="
+echo
+set -x
+
+cd "$base"
 autoreconf --install --force
 ./configure $INSTR
 $MAKE $PARALLEL_MAKE

-- 
To view, visit https://gerrit.osmocom.org/6618
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: If345c89293fcd7d1ad4f17214eea339951f25a5d
Gerrit-PatchSet: 5
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy

osmo-trx[master]: Depend on libosmocore

2018-02-21 Thread Vadim Yanitskiy


Patch Set 5: Code-Review+1

-- 
To view, visit https://gerrit.osmocom.org/6618
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If345c89293fcd7d1ad4f17214eea339951f25a5d
Gerrit-PatchSet: 5
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-HasComments: No

osmo-trx[master]: Depend on libosmocore and enable talloc reports

2018-02-21 Thread Vadim Yanitskiy


Patch Set 4:

I would prefer to integrate both talloc and signal handlers separately...

-- 
To view, visit https://gerrit.osmocom.org/6618
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If345c89293fcd7d1ad4f17214eea339951f25a5d
Gerrit-PatchSet: 4
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-HasComments: No

[PATCH] osmo-trx[master]: Depend on libosmocore and enable talloc reports

2018-02-20 Thread Pau Espin Pedrol

Hello Jenkins Builder,

I'd like you to reexamine a change.  Please visit

https://gerrit.osmocom.org/6618

to look at the new patch set (#4).

Depend on libosmocore and enable talloc reports

Change-Id: If345c89293fcd7d1ad4f17214eea339951f25a5d
---
M Transceiver52M/Makefile.am
M Transceiver52M/osmo-trx.cpp
M configure.ac
M contrib/jenkins.sh
4 files changed, 61 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/18/6618/4

diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am
index f36f4d4..21104dc 100644
--- a/Transceiver52M/Makefile.am
+++ b/Transceiver52M/Makefile.am
@@ -22,7 +22,7 @@
 include $(top_srcdir)/Makefile.common
 
 AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/common
-AM_CXXFLAGS = -lpthread
+AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS)
 
 SUBDIRS = arm x86
 
@@ -92,7 +92,8 @@
$(ARCH_LA) \
$(GSM_LA) \
$(COMMON_LA) \
-   $(FFTWF_LIBS)
+   $(FFTWF_LIBS) \
+   $(LIBOSMOCORE_LIBS)
 
 if USRP1
 libtransceiver_la_SOURCES += USRPDevice.cpp
diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp
index 16866f4..40269e1 100644
--- a/Transceiver52M/osmo-trx.cpp
+++ b/Transceiver52M/osmo-trx.cpp
@@ -37,6 +37,9 @@
 #include 
 
 extern "C" {
+#include 
+#include 
+#include 
 #include "convolve.h"
 #include "convert.h"
 }
@@ -88,6 +91,8 @@
 };
 
 volatile bool gshutdown = false;
+
+static void *tall_trx_ctx;
 
 /* Setup configuration values
  * Don't query the existence of the Log.Level because it's a
@@ -240,20 +245,35 @@
 
 static void sig_handler(int signo)
 {
-   fprintf(stdout, "Received shutdown signal");
-   gshutdown = true;
+   fprintf(stdout, "signal %d received\n", signo);
+   switch (signo) {
+   case SIGINT:
+   case SIGTERM:
+   fprintf(stdout, "SIGINT received, shutting down\n");
+   gshutdown = true;
+   break;
+   case SIGABRT:
+   case SIGUSR1:
+   talloc_report(tall_trx_ctx, stderr);
+   talloc_report_full(tall_trx_ctx, stderr);
+   break;
+   case SIGUSR2:
+   talloc_report_full(tall_trx_ctx, stderr);
+   break;
+   default:
+   break;
+   }
 }
 
 static void setup_signal_handlers()
 {
-   if (signal(SIGINT, sig_handler) == SIG_ERR) {
-   fprintf(stderr, "Failed to install SIGINT signal handler\n");
-   exit(EXIT_FAILURE);
-   }
-   if (signal(SIGTERM, sig_handler) == SIG_ERR) {
-   fprintf(stderr, "Couldn't install SIGTERM signal handler\n");
-   exit( EXIT_FAILURE);
-   }
+   /* Handle keyboard interrupt SIGINT */
+   signal(SIGINT, _handler);
+   signal(SIGTERM, _handler);
+   signal(SIGABRT, _handler);
+   signal(SIGUSR1, _handler);
+   signal(SIGUSR2, _handler);
+   osmo_init_ignore_signals();
 }
 
 
@@ -478,6 +498,10 @@
RadioDevice::InterfaceType iface = RadioDevice::NORMAL;
struct trx_config config;
 
+   tall_trx_ctx = talloc_named_const(NULL, 0, "OsmoTRX");
+   msgb_talloc_ctx_init(tall_trx_ctx, 0);
+   setup_signal_handlers();
+
 #ifdef HAVE_SSE3
printf("Info: SSE3 support compiled in");
 #ifdef HAVE___BUILTIN_CPU_SUPPORTS
@@ -511,8 +535,6 @@
if (set_sched_rr(config.sched_rr) < 0)
return EXIT_FAILURE;
}
-
-   setup_signal_handlers();
 
/* Check database sanity */
if (!trx_setup_config()) {
diff --git a/configure.ac b/configure.ac
index 5c034e5..cba4a0c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,6 +73,8 @@
 AC_HEADER_TIME
 AC_C_BIGENDIAN
 
+PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.10.0)
+
 AC_ARG_WITH(usrp1, [
 AS_HELP_STRING([--with-usrp1],
 [enable USRP1 gnuradio based transceiver])
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 11def5c..5f1eed9 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -15,6 +15,11 @@
 mychroot_nocwd -w / "$@"
 }
 
+base="$PWD"
+deps="$base/deps"
+inst="$deps/install"
+export deps inst
+
 if [ -z "${INSIDE_CHROOT}" ]; then
 
 osmo-clean-workspace.sh
@@ -49,8 +54,24 @@
 fi
 fi
 
-### BUILD osmo-trx
+mkdir "$deps" || true
 
+osmo-build-dep.sh libosmocore "" --disable-doxygen
+
+verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]")
+
+export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
+export LD_LIBRARY_PATH="$inst/lib"
+
+set +x
+echo
+echo
+echo
+echo " === osmo-trx 
==="
+echo
+set -x
+
+cd "$base"
 autoreconf --install --force
 ./configure $INSTR
 $MAKE $PARALLEL_MAKE

-- 
To view, visit https://gerrit.osmocom.org/6618
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: If345c89293fcd7d1ad4f17214eea339951f25a5d
Gerrit-PatchSet: 4
Gerrit-Project: osmo-trx

[PATCH] osmo-trx[master]: Depend on libosmocore and enable talloc reports

2018-02-20 Thread Pau Espin Pedrol


Depend on libosmocore and enable talloc reports

Change-Id: If345c89293fcd7d1ad4f17214eea339951f25a5d
---
M Transceiver52M/Makefile.am
M Transceiver52M/osmo-trx.cpp
M configure.ac
M contrib/jenkins.sh
4 files changed, 56 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/18/6618/2

diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am
index f36f4d4..21104dc 100644
--- a/Transceiver52M/Makefile.am
+++ b/Transceiver52M/Makefile.am
@@ -22,7 +22,7 @@
 include $(top_srcdir)/Makefile.common
 
 AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/common
-AM_CXXFLAGS = -lpthread
+AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS)
 
 SUBDIRS = arm x86
 
@@ -92,7 +92,8 @@
$(ARCH_LA) \
$(GSM_LA) \
$(COMMON_LA) \
-   $(FFTWF_LIBS)
+   $(FFTWF_LIBS) \
+   $(LIBOSMOCORE_LIBS)
 
 if USRP1
 libtransceiver_la_SOURCES += USRPDevice.cpp
diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp
index 16866f4..40269e1 100644
--- a/Transceiver52M/osmo-trx.cpp
+++ b/Transceiver52M/osmo-trx.cpp
@@ -37,6 +37,9 @@
 #include 
 
 extern "C" {
+#include 
+#include 
+#include 
 #include "convolve.h"
 #include "convert.h"
 }
@@ -88,6 +91,8 @@
 };
 
 volatile bool gshutdown = false;
+
+static void *tall_trx_ctx;
 
 /* Setup configuration values
  * Don't query the existence of the Log.Level because it's a
@@ -240,20 +245,35 @@
 
 static void sig_handler(int signo)
 {
-   fprintf(stdout, "Received shutdown signal");
-   gshutdown = true;
+   fprintf(stdout, "signal %d received\n", signo);
+   switch (signo) {
+   case SIGINT:
+   case SIGTERM:
+   fprintf(stdout, "SIGINT received, shutting down\n");
+   gshutdown = true;
+   break;
+   case SIGABRT:
+   case SIGUSR1:
+   talloc_report(tall_trx_ctx, stderr);
+   talloc_report_full(tall_trx_ctx, stderr);
+   break;
+   case SIGUSR2:
+   talloc_report_full(tall_trx_ctx, stderr);
+   break;
+   default:
+   break;
+   }
 }
 
 static void setup_signal_handlers()
 {
-   if (signal(SIGINT, sig_handler) == SIG_ERR) {
-   fprintf(stderr, "Failed to install SIGINT signal handler\n");
-   exit(EXIT_FAILURE);
-   }
-   if (signal(SIGTERM, sig_handler) == SIG_ERR) {
-   fprintf(stderr, "Couldn't install SIGTERM signal handler\n");
-   exit( EXIT_FAILURE);
-   }
+   /* Handle keyboard interrupt SIGINT */
+   signal(SIGINT, _handler);
+   signal(SIGTERM, _handler);
+   signal(SIGABRT, _handler);
+   signal(SIGUSR1, _handler);
+   signal(SIGUSR2, _handler);
+   osmo_init_ignore_signals();
 }
 
 
@@ -478,6 +498,10 @@
RadioDevice::InterfaceType iface = RadioDevice::NORMAL;
struct trx_config config;
 
+   tall_trx_ctx = talloc_named_const(NULL, 0, "OsmoTRX");
+   msgb_talloc_ctx_init(tall_trx_ctx, 0);
+   setup_signal_handlers();
+
 #ifdef HAVE_SSE3
printf("Info: SSE3 support compiled in");
 #ifdef HAVE___BUILTIN_CPU_SUPPORTS
@@ -511,8 +535,6 @@
if (set_sched_rr(config.sched_rr) < 0)
return EXIT_FAILURE;
}
-
-   setup_signal_handlers();
 
/* Check database sanity */
if (!trx_setup_config()) {
diff --git a/configure.ac b/configure.ac
index 5c034e5..cba4a0c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,6 +73,8 @@
 AC_HEADER_TIME
 AC_C_BIGENDIAN
 
+PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.10.0)
+
 AC_ARG_WITH(usrp1, [
 AS_HELP_STRING([--with-usrp1],
 [enable USRP1 gnuradio based transceiver])
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 11def5c..123ab10 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -15,6 +15,11 @@
 mychroot_nocwd -w / "$@"
 }
 
+base="$PWD"
+deps="$base/deps"
+inst="$deps/install"
+export deps inst
+
 if [ -z "${INSIDE_CHROOT}" ]; then
 
 osmo-clean-workspace.sh
@@ -49,8 +54,19 @@
 fi
 fi
 
-### BUILD osmo-trx
+mkdir "$deps" || true
 
+osmo-build-dep.sh libosmocore "" --disable-doxygen
+
+set +x
+echo
+echo
+echo
+echo " === osmo-trx 
==="
+echo
+set -x
+
+cd "$base"
 autoreconf --install --force
 ./configure $INSTR
 $MAKE $PARALLEL_MAKE

-- 
To view, visit https://gerrit.osmocom.org/6618
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: If345c89293fcd7d1ad4f17214eea339951f25a5d
Gerrit-PatchSet: 2
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Jenkins Builder

[PATCH] osmo-trx[master]: Depend on libosmocore and enable talloc reports

2018-02-20 Thread Pau Espin Pedrol


Review at  https://gerrit.osmocom.org/6618

Depend on libosmocore and enable talloc reports

Change-Id: If345c89293fcd7d1ad4f17214eea339951f25a5d
---
M Transceiver52M/Makefile.am
M Transceiver52M/osmo-trx.cpp
M configure.ac
3 files changed, 39 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/18/6618/1

diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am
index f36f4d4..21104dc 100644
--- a/Transceiver52M/Makefile.am
+++ b/Transceiver52M/Makefile.am
@@ -22,7 +22,7 @@
 include $(top_srcdir)/Makefile.common
 
 AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/common
-AM_CXXFLAGS = -lpthread
+AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS)
 
 SUBDIRS = arm x86
 
@@ -92,7 +92,8 @@
$(ARCH_LA) \
$(GSM_LA) \
$(COMMON_LA) \
-   $(FFTWF_LIBS)
+   $(FFTWF_LIBS) \
+   $(LIBOSMOCORE_LIBS)
 
 if USRP1
 libtransceiver_la_SOURCES += USRPDevice.cpp
diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp
index 16866f4..40269e1 100644
--- a/Transceiver52M/osmo-trx.cpp
+++ b/Transceiver52M/osmo-trx.cpp
@@ -37,6 +37,9 @@
 #include 
 
 extern "C" {
+#include 
+#include 
+#include 
 #include "convolve.h"
 #include "convert.h"
 }
@@ -88,6 +91,8 @@
 };
 
 volatile bool gshutdown = false;
+
+static void *tall_trx_ctx;
 
 /* Setup configuration values
  * Don't query the existence of the Log.Level because it's a
@@ -240,20 +245,35 @@
 
 static void sig_handler(int signo)
 {
-   fprintf(stdout, "Received shutdown signal");
-   gshutdown = true;
+   fprintf(stdout, "signal %d received\n", signo);
+   switch (signo) {
+   case SIGINT:
+   case SIGTERM:
+   fprintf(stdout, "SIGINT received, shutting down\n");
+   gshutdown = true;
+   break;
+   case SIGABRT:
+   case SIGUSR1:
+   talloc_report(tall_trx_ctx, stderr);
+   talloc_report_full(tall_trx_ctx, stderr);
+   break;
+   case SIGUSR2:
+   talloc_report_full(tall_trx_ctx, stderr);
+   break;
+   default:
+   break;
+   }
 }
 
 static void setup_signal_handlers()
 {
-   if (signal(SIGINT, sig_handler) == SIG_ERR) {
-   fprintf(stderr, "Failed to install SIGINT signal handler\n");
-   exit(EXIT_FAILURE);
-   }
-   if (signal(SIGTERM, sig_handler) == SIG_ERR) {
-   fprintf(stderr, "Couldn't install SIGTERM signal handler\n");
-   exit( EXIT_FAILURE);
-   }
+   /* Handle keyboard interrupt SIGINT */
+   signal(SIGINT, _handler);
+   signal(SIGTERM, _handler);
+   signal(SIGABRT, _handler);
+   signal(SIGUSR1, _handler);
+   signal(SIGUSR2, _handler);
+   osmo_init_ignore_signals();
 }
 
 
@@ -478,6 +498,10 @@
RadioDevice::InterfaceType iface = RadioDevice::NORMAL;
struct trx_config config;
 
+   tall_trx_ctx = talloc_named_const(NULL, 0, "OsmoTRX");
+   msgb_talloc_ctx_init(tall_trx_ctx, 0);
+   setup_signal_handlers();
+
 #ifdef HAVE_SSE3
printf("Info: SSE3 support compiled in");
 #ifdef HAVE___BUILTIN_CPU_SUPPORTS
@@ -511,8 +535,6 @@
if (set_sched_rr(config.sched_rr) < 0)
return EXIT_FAILURE;
}
-
-   setup_signal_handlers();
 
/* Check database sanity */
if (!trx_setup_config()) {
diff --git a/configure.ac b/configure.ac
index 5c034e5..cba4a0c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,6 +73,8 @@
 AC_HEADER_TIME
 AC_C_BIGENDIAN
 
+PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.10.0)
+
 AC_ARG_WITH(usrp1, [
 AS_HELP_STRING([--with-usrp1],
 [enable USRP1 gnuradio based transceiver])

-- 
To view, visit https://gerrit.osmocom.org/6618
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If345c89293fcd7d1ad4f17214eea339951f25a5d
Gerrit-PatchSet: 1
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Jenkins Builder

osmo-trx[master]: Depend on libosmocore

[MERGED] osmo-trx[master]: Depend on libosmocore

[PATCH] osmo-trx[master]: Depend on libosmocore

[PATCH] osmo-trx[master]: Depend on libosmocore

[PATCH] osmo-trx[master]: Depend on libosmocore

osmo-trx[master]: Depend on libosmocore

osmo-trx[master]: Depend on libosmocore and enable talloc reports

[PATCH] osmo-trx[master]: Depend on libosmocore and enable talloc reports

[PATCH] osmo-trx[master]: Depend on libosmocore and enable talloc reports

[PATCH] osmo-trx[master]: Depend on libosmocore and enable talloc reports

10 matches

Site Navigation

Mail list logo

Footer information