Attention is currently required from: fixeria, neels.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35005?usp=email )
Change subject: core: add parity calculation functions for uint{32,16,8}_t
......................................................................
Patch Set 1:
(1 comment)
Commit Message:
https://gerrit.osmocom.org/c/libosmocore/+/35005/comment/3354dbf4_c4bad8dc
PS1, Line 8:
> Yes, Harald's guess is correct. […]
I'd rather not merge functions where we don't know we actually have any immediate users. Let's then abandon this one?
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35005?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I2d6265eac5ce062276a40f4968b129d8702c6117
Gerrit-Change-Number: 35005
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 15 Nov 2023 21:55:30 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de>
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: comment
laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35013?usp=email )
Change subject: Use 2023q1 osmo-ttcn3-hacks branch for 2023q1 SUTs
......................................................................
Use 2023q1 osmo-ttcn3-hacks branch for 2023q1 SUTs
Fix the TTCN3-centos-pcu-test-2023q1 jenkins job where currently most
tests are failing. This is because 2023q1 is using an older PCUIF
version that is no longer supported by osmo-ttcn3-hacks.git. As
discussed, use a 2023q1 branch of osmo-ttcn3-hacks where the support was
not removed yet.
Fixes: SYS#6638
Change-Id: Id82425aca4a8ff87feb8a130d31712bc62fa27ed
---
M jenkins-common.sh
1 file changed, 38 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
diff --git a/jenkins-common.sh b/jenkins-common.sh
index 4e476f6..7978749 100644
--- a/jenkins-common.sh
+++ b/jenkins-common.sh
@@ -122,6 +122,27 @@
set -x
}
+# Get the osmo-ttcn3-hacks branch to use, based on the IMAGE_SUFFIX we are
+# testing. This allows e.g. running 2023q1 SUTs against the 2023q1 branch of
+# osmo-ttcn3-hacks.git (SYS#6638). The OSMO_TTCN3_BRANCH env var can be used to
+# override it in any case.
+# $IMAGE_SUFFIX: e.g. 2023q1-centos8
+docker_osmo_ttcn3_branch() {
+ if [ -n "$OSMO_TTCN3_BRANCH" ]; then
+ echo "$OSMO_TTCN3_BRANCH"
+ return
+ fi
+
+ case "$IMAGE_SUFFIX" in
+ 20*q*)
+ echo "$IMAGE_SUFFIX" | cut -d- -f 1
+ ;;
+ *)
+ echo "master"
+ ;;
+ esac
+}
+
# Make sure required images are available and build them if necessary.
# $*: image names (e.g. "debian-bullseye-build", "osmo-mgw-master", "osmo-mgw-master-centos8")
# The images are automatically built from the Dockerfile of the subdir of
@@ -184,6 +205,7 @@
UPSTREAM_DISTRO="$upstream_distro_arg" \
DISTRO="$distro_arg" \
IMAGE="$REPO_USER/$i" \
+ OSMO_TTCN3_BRANCH="$(docker_osmo_ttcn3_branch)" \
|| exit 1
fi
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35013?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Id82425aca4a8ff87feb8a130d31712bc62fa27ed
Gerrit-Change-Number: 35013
Gerrit-PatchSet: 3
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-MessageType: merged
laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34881?usp=email )
Change subject: gsmtap_util: Simplify sink
......................................................................
gsmtap_util: Simplify sink
- Instead of using the osmo_fd API to call read() on the socket's file
descriptor each time (unused) data is received, simply open the
socket and never read
Related: OS#6213
Change-Id: I4025920d5f62d17133e9b5fe81cd34a88c4f20b5
---
M src/core/gsmtap_util.c
1 file changed, 21 insertions(+), 43 deletions(-)
Approvals:
daniel: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/core/gsmtap_util.c b/src/core/gsmtap_util.c
index 458d1d7..d817885 100644
--- a/src/core/gsmtap_util.c
+++ b/src/core/gsmtap_util.c
@@ -58,7 +58,7 @@
struct osmo_wqueue wq; /*!< the wait queue. This field member may not be changed or moved (backwards compatibility) */
struct osmo_io_fd *out; /*!< Used when osmo_io_mode is nonzero */
- struct osmo_fd sink_ofd;
+ int sink_fd;
};
struct _gsmtap_inst_legacy {
@@ -433,22 +433,6 @@
signal_dbm, snr, data, len);
}
-/* Callback from select layer if we can read from the sink socket */
-static int gsmtap_sink_fd_cb(struct osmo_fd *fd, unsigned int flags)
-{
- int rc;
- uint8_t buf[4096];
- if (!(flags & OSMO_FD_READ))
- return 0;
-
- rc = read(fd->fd, buf, sizeof(buf));
- if (rc < 0)
- return rc;
- /* simply discard any data arriving on the socket */
-
- return 0;
-}
-
/*! Add a local sink to an existing GSMTAP source and return fd
* \param[in] gti existing GSMTAP source
* \returns file descriptor of locally bound receive socket
@@ -466,28 +450,7 @@
*/
int gsmtap_source_add_sink(struct gsmtap_inst *gti)
{
- int fd, rc;
-
- fd = gsmtap_source_add_sink_fd(gsmtap_inst_fd2(gti));
- if (fd < 0)
- return fd;
-
- if (gti->osmo_io_mode) {
- struct osmo_fd *sink_ofd;
-
- sink_ofd = >i->sink_ofd;
- sink_ofd->fd = fd;
- sink_ofd->when = OSMO_FD_READ;
- sink_ofd->cb = gsmtap_sink_fd_cb;
-
- rc = osmo_fd_register(sink_ofd);
- if (rc < 0) {
- close(fd);
- return rc;
- }
- }
-
- return fd;
+ return gti->sink_fd = gsmtap_source_add_sink_fd(gsmtap_inst_fd2(gti));
}
/* Registered in Osmo IO as a no-op to set the write callback. */
@@ -524,7 +487,7 @@
gti->osmo_io_mode = ofd_wq_mode;
/* Still using the wq member for its 'fd' field only, since we are keeping it for now, anyways */
gti->wq.bfd.fd = fd;
- gti->sink_ofd.fd = -1;
+ gti->sink_fd = -1;
if (ofd_wq_mode) {
gti->out = osmo_iofd_setup(gti, gti->wq.bfd.fd, "gsmtap_inst.io_fd", OSMO_IO_FD_MODE_READ_WRITE, &gsmtap_ops, NULL);
@@ -564,10 +527,11 @@
if (gti->osmo_io_mode) {
osmo_iofd_free(gti->out);
- if (gti->sink_ofd.fd != -1) {
- osmo_fd_unregister(>i->sink_ofd);
- close(gti->sink_ofd.fd);
+ if (gti->sink_fd != -1) {
+ close(gti->sink_fd);
+ gti->sink_fd = -1;
}
+
}
talloc_free(gti);
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34881?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I4025920d5f62d17133e9b5fe81cd34a88c4f20b5
Gerrit-Change-Number: 34881
Gerrit-PatchSet: 5
Gerrit-Owner: arehbein <arehbein(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: merged