September 2022 - gerrit-log - lists.osmocom.org

Change in libosmo-netif[master]: tests: rename test osmux_test2 -> osmux_output_test

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29506 ) Change subject: tests: rename test osmux_test2 -> osmux_output_test ...................................................................... tests: rename test osmux_test2 -> osmux_output_test That file focuses on testing the osmux_output_* API, ie receiving Osmux frames and decoding it into batches and later on into rtp packets. Change-Id: I7e6eda1e2e676673771bc6a7c3682d07ac1d344e --- M tests/Makefile.am R tests/osmux/osmux_output_test.c R tests/osmux/osmux_output_test.ok M tests/testsuite.at 4 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/06/29506/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index dd7703a..ab2bf59 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,14 +1,14 @@ AM_CFLAGS = -Wall -I$(top_srcdir)/include $(LIBOSMOCORE_CFLAGS) -g AM_LDFLAGS = $(LIBOSMOCORE_LDFLAGS) -no-install -check_PROGRAMS = osmux/osmux_test osmux/osmux_test2 stream/stream_test jibuf/jibuf_test amr/amr_test +check_PROGRAMS = osmux/osmux_test osmux/osmux_output_test stream/stream_test jibuf/jibuf_test amr/amr_test check_HEADERS = osmux_osmux_test_SOURCES = osmux/osmux_test.c osmux_osmux_test_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(top_builddir)/src/libosmonetif.la -osmux_osmux_test2_SOURCES = osmux/osmux_test2.c -osmux_osmux_test2_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(top_builddir)/src/libosmonetif.la +osmux_osmux_output_test_SOURCES = osmux/osmux_output_test.c +osmux_osmux_output_test_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(top_builddir)/src/libosmonetif.la stream_stream_test_SOURCES = stream/stream_test.c stream_stream_test_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(top_builddir)/src/libosmonetif.la @@ -62,7 +62,7 @@ EXTRA_DIST = testsuite.at $(srcdir)/package.m4 $(TESTSUITE) \ osmux/osmux_test.ok \ - osmux/osmux_test2.ok \ + osmux/osmux_output_test.ok \ stream/stream_test.ok \ stream/stream_test.err \ jibuf/jibuf_test.ok \ diff --git a/tests/osmux/osmux_test2.c b/tests/osmux/osmux_output_test.c similarity index 100% rename from tests/osmux/osmux_test2.c rename to tests/osmux/osmux_output_test.c diff --git a/tests/osmux/osmux_test2.ok b/tests/osmux/osmux_output_test.ok similarity index 100% rename from tests/osmux/osmux_test2.ok rename to tests/osmux/osmux_output_test.ok diff --git a/tests/testsuite.at b/tests/testsuite.at index 0cf108f..17883cc 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -14,10 +14,10 @@ AT_CHECK([$abs_top_builddir/tests/osmux/osmux_test 2>&1], [0], [expout], [ignore]) AT_CLEANUP -AT_SETUP([osmux_test2]) -AT_KEYWORDS([osmux_test2]) -cat $abs_srcdir/osmux/osmux_test2.ok > expout -AT_CHECK([$abs_top_builddir/tests/osmux/osmux_test2], [0], [expout], [ignore]) +AT_SETUP([osmux_output_test]) +AT_KEYWORDS([osmux_output_test]) +cat $abs_srcdir/osmux/osmux_output_test.ok > expout +AT_CHECK([$abs_top_builddir/tests/osmux/osmux_output_test], [0], [expout], [ignore]) AT_CLEANUP AT_SETUP([jibuf_test]) -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29506 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I7e6eda1e2e676673771bc6a7c3682d07ac1d344e Gerrit-Change-Number: 29506 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in libosmo-netif[master]: tests/osmux: Always run with fake time

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29505 ) Change subject: tests/osmux: Always run with fake time ...................................................................... tests/osmux: Always run with fake time Let's not make the tests more difficult to maintain and extend by allowing them to run in real clock time, there's no real need for it. Change-Id: I549a4722d63d700b54b146260131a68e656b843e --- M tests/osmux/osmux_test.c 1 file changed, 1 insertion(+), 36 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/05/29505/1 diff --git a/tests/osmux/osmux_test.c b/tests/osmux/osmux_test.c index 54e9368..3284a15 100644 --- a/tests/osmux/osmux_test.c +++ b/tests/osmux/osmux_test.c @@ -1,6 +1,7 @@ /* * (C) 2013 by Pablo Neira Ayuso <pablo(a)gnumonks.org> * (C) 2013 by On Waves ehf <http://www.on-waves.com> + * (C) 2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -8,8 +9,6 @@ * (at your option) any later version. */ -#define OSMUX_TEST_USE_TIMING 0 - #include <stdio.h> #include <stdlib.h> #include <unistd.h> @@ -17,9 +16,6 @@ #include <string.h> #include <signal.h> #include <arpa/inet.h> -#if OSMUX_TEST_USE_TIMING -#include <sys/time.h> -#endif #include <osmocom/core/select.h> #include <osmocom/core/application.h> @@ -59,9 +55,6 @@ static int rtp_pkts; static int mark_pkts; -#if OSMUX_TEST_USE_TIMING -static struct timeval last; -#endif #define clock_debug(fmt, args...) \ do { \ @@ -92,20 +85,6 @@ { struct rtp_hdr *rtph = (struct rtp_hdr *)msg->data; char buf[4096]; -#if OSMUX_TEST_USE_TIMING - struct timeval now, diff; - - osmo_gettimeofday(&now, NULL); - timersub(&now, &last, &diff); - last = now; - - if (diff.tv_usec > 2*17000) { - clock_debug("delivery of reconstructed RTP lagged" - " (diff.tv_usec=%u > 2*17000)\n", - (unsigned int)diff.tv_usec); - exit(EXIT_FAILURE); - } -#endif osmo_rtp_snprintf(buf, sizeof(buf), msg); clock_debug("extracted packet: %s\n", buf); @@ -185,15 +164,11 @@ osmux_xfrm_input_deliver(&h_input); } } -#if !OSMUX_TEST_USE_TIMING clock_override_add(0, PKT_TIME_USEC); -#endif } while (rtp_pkts) { -#if !OSMUX_TEST_USE_TIMING clock_override_add(1, 0); -#endif osmo_select_main(0); } @@ -242,10 +217,6 @@ osmux_xfrm_input(&h_input, msg, (i % 2) + ccid); if (i % 4 == 0) { -#if OSMUX_TEST_USE_TIMING - osmo_gettimeofday(&last, NULL); -#endif - /* After four RTP messages, squash them into the OSMUX * batch and call the routine to deliver it. */ @@ -258,9 +229,7 @@ */ for (j = 0; j < k-2; j++) { osmo_select_main(0); -#if !OSMUX_TEST_USE_TIMING clock_override_add(0, PKT_TIME_USEC); -#endif } k = 0; @@ -282,11 +251,9 @@ exit(EXIT_FAILURE); } -#if !OSMUX_TEST_USE_TIMING /* This test uses fake time to speedup the run, unless we want to manually * test time specific stuff */ clock_override_enable(true); -#endif /* This test doesn't use it, but osmux requires it internally. */ void *tall_ctx = talloc_named_const(NULL, 1, "Root context"); @@ -309,7 +276,6 @@ /* If the test takes longer than 10 seconds, abort it */ alarm(10); -#if !OSMUX_TEST_USE_TIMING /* Check if marker bit features work correctly */ osmux_xfrm_input_init(&h_input); for (i = 0; i < 4; i++) @@ -318,7 +284,6 @@ for (i = 0; i < 4; i++) osmux_xfrm_input_close_circuit(&h_input, i); osmux_xfrm_input_fini(&h_input); -#endif osmux_xfrm_input_init(&h_input); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29505 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I549a4722d63d700b54b146260131a68e656b843e Gerrit-Change-Number: 29505 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in libosmo-netif[master]: tests/osmux_test2: Document unit tests

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29504 ) Change subject: tests/osmux_test2: Document unit tests ...................................................................... tests/osmux_test2: Document unit tests Change-Id: I56f27af52b6a8d798879c70d68a9a3b9e512867d --- M tests/osmux/osmux_test2.c 1 file changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/04/29504/1 diff --git a/tests/osmux/osmux_test2.c b/tests/osmux/osmux_test2.c index 7a66920..421dac4 100644 --- a/tests/osmux/osmux_test2.c +++ b/tests/osmux/osmux_test2.c @@ -155,6 +155,7 @@ OSMO_ASSERT(_rc == _osmuxh->ctr+1); \ } +/* Test some regular scenario where frames arrive at exactly the time they should. */ static void test_output_consecutive(void) { struct osmux_out_handle *h_output; @@ -222,6 +223,12 @@ talloc_free(h_output); } +/* Test that receiving new osmux frame triggers flushing of RTP pakcets + * generated from previous one, to avoid steady growing delay in scheduling due to + * jitter of osmux packets received. Specifically test case where the 2 Osmux + * packets arrive with a small delay of system time in between them, aka the 1st + * Osmux frame has had some of its AMR payloads already forwarded as RTP to the + * upper layers. */ static void test_output_interleaved(void) { struct osmux_out_handle *h_output; @@ -264,6 +271,11 @@ talloc_free(h_output); } +/* Test that receiving new osmux frame triggers flushing of RTP pakcets + * generated from previous one, to avoid steady growing delay in scheduling due to + * jitter of osmux packets received. Specifically test case where the 2 Osmux + * packets arrive (almost) exactly at the same time, so no internal acton is + * triggered between receival of those. */ static void test_output_2together(void) { struct osmux_out_handle *h_output; @@ -302,7 +314,8 @@ talloc_free(h_output); } -/* FIXME: this test shows generated rtp stream doesn't have osmux lost frames into account! */ +/* Generated rtp stream gets first RTP pkt marked with M bit after osmux frame + * lost is detected (hence a gap in sequence) */ static void test_output_frame_lost(void) { struct osmux_out_handle *h_output; @@ -340,6 +353,8 @@ talloc_free(h_output); } +/* Test all packets are transmitted immediately when osmux_xfrm_output_flush() + * is flushed. */ static void test_output_flush(void) { struct osmux_out_handle *h_output; -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I56f27af52b6a8d798879c70d68a9a3b9e512867d Gerrit-Change-Number: 29504 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in libosmo-gprs[master]: tests/llc/pdu_codec_test: use const char * const

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29503 ) Change subject: tests/llc/pdu_codec_test: use const char * const ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29503 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I9b952b05fed11f26d2839314270e2862db3d036a Gerrit-Change-Number: 29503 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Sep 2022 08:52:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in libosmo-gprs[master]: llc: implement Exchange Identification (XID) codec

by pespin

Attention is currently required from: osmith, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29482 ) Change subject: llc: implement Exchange Identification (XID) codec ...................................................................... Patch Set 4: Code-Review+1 (2 comments) File include/osmocom/gprs/llc/llc.h: https://gerrit.osmocom.org/c/libosmo-gprs/+/29482/comment/62b1a01a_986720af PS4, Line 100: /* Fixed-length */ Fixed-length value https://gerrit.osmocom.org/c/libosmo-gprs/+/29482/comment/b66b23d1_ef55fdb5 PS4, Line 102: /* Variable-length */ Variable-length value -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29482 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I16b3f7ab82c489144098aad0dccc4c67d8382c67 Gerrit-Change-Number: 29482 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Sep 2022 08:52:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in libosmo-gprs[master]: tests/llc/pdu_codec_test: use const char * const

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29503 ) Change subject: tests/llc/pdu_codec_test: use const char * const ...................................................................... tests/llc/pdu_codec_test: use const char * const Not really important, just makes the linter happy. Change-Id: I9b952b05fed11f26d2839314270e2862db3d036a --- M tests/llc/pdu_codec_test.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/03/29503/1 diff --git a/tests/llc/pdu_codec_test.c b/tests/llc/pdu_codec_test.c index f2418fe..d1169a7 100644 --- a/tests/llc/pdu_codec_test.c +++ b/tests/llc/pdu_codec_test.c @@ -28,7 +28,7 @@ static void test_pdu_dec_enc(void) { - static const char *testData[] = { + static const char * const testData[] = { /* SAPI=1 (GMM), UI func=UI C/R=0 PM=0 N(U)=4 */ "01c010080509afe633", /* SAPI=1 (GMM), UI func=UI C/R=1 PM=1 N(U)=0 */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29503 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I9b952b05fed11f26d2839314270e2862db3d036a Gerrit-Change-Number: 29503 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in libosmo-gprs[master]: llc: implement Exchange Identification (XID) codec

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29482 to look at the new patch set (#4). Change subject: llc: implement Exchange Identification (XID) codec ...................................................................... llc: implement Exchange Identification (XID) codec Change-Id: I16b3f7ab82c489144098aad0dccc4c67d8382c67 --- M include/osmocom/gprs/llc/llc.h M src/llc/llc_xid.c M tests/llc/pdu_codec_test.c M tests/llc/pdu_codec_test.ok 4 files changed, 403 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/82/29482/4 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29482 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I16b3f7ab82c489144098aad0dccc4c67d8382c67 Gerrit-Change-Number: 29482 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in libosmo-netif[master]: osmux: assert no batch factor greater than 8 is used

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29502 ) Change subject: osmux: assert no batch factor greater than 8 is used ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29502 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ie17a8174bc220d091cb7ff880363d22179b4f621 Gerrit-Change-Number: 29502 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Sep 2022 08:33:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in libosmo-netif[master]: osmux: Early return on error or batch full during osmux_replay_lost_p...

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29501 ) Change subject: osmux: Early return on error or batch full during osmux_replay_lost_packets() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29501 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I62f494d2b2e7903a6683f6dea00781bb721a3d41 Gerrit-Change-Number: 29501 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Sep 2022 08:33:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in libosmo-netif[master]: osmux: Unify return codes of osmux_batch_add() and osmux_batch_enqueue()

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29500 ) Change subject: osmux: Unify return codes of osmux_batch_add() and osmux_batch_enqueue() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29500 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ib78c9b82b85c74be2c5e94dae7c212175244d5fa Gerrit-Change-Number: 29500 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Sep 2022 08:31:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2022