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

Change in osmo-e1d[master]: RIFO: add more thorough tests and a vetted test.ok file

by manawyrm

manawyrm has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27715 ) Change subject: RIFO: add more thorough tests and a vetted test.ok file ...................................................................... RIFO: add more thorough tests and a vetted test.ok file This commit adds 2 new tests: - too old frames (which should get dropped) - already correct frames (which shouldn't be touched) In addition, every test will now be run twice. Once at frame number 0 and once very close to the wrap-around of the internal frame counter in order to observe the behaviour. Change-Id: I930b4361924b2e8bcb566eb7ee64f36e06bc7745 --- M tests/rifo/rifo_test.c A tests/rifo/rifo_test.ok 2 files changed, 284 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/15/27715/1 diff --git a/tests/rifo/rifo_test.c b/tests/rifo/rifo_test.c index c656c97..5dac5ba 100644 --- a/tests/rifo/rifo_test.c +++ b/tests/rifo/rifo_test.c @@ -9,11 +9,11 @@ #include "frame_rifo.h" static void *g_e1d_ctx; +static uint32_t init_next_out_fn; static void rifo_in(struct frame_rifo *rifo, uint8_t *frame, uint32_t fn) { - printf("RIFO_IN(%s, %u)\n", osmo_hexdump_nospc(frame, BYTES_PER_FRAME), fn); - OSMO_ASSERT(frame_rifo_in(rifo, frame, fn) == 0); + printf("RIFO_IN(%s, %u)=%d\n", osmo_hexdump_nospc(frame, BYTES_PER_FRAME), fn, frame_rifo_in(rifo, frame, fn)); } static int rifo_out(struct frame_rifo *rifo, uint8_t *out) @@ -23,18 +23,21 @@ return rc; } - -static void missing_frames(void) +static void missing_frames(uint8_t modulo) { struct frame_rifo rifo; frame_rifo_init(&rifo); + rifo.next_out_fn = init_next_out_fn; - printf("\nTEST: %s\n", __func__); + printf("\nTEST: %s, starting at FN: %u\n", __func__, init_next_out_fn); for (int i = 0; i < 10; i++) { uint8_t frame[32]; memset(frame, i, sizeof(frame)); - rifo_in(&rifo, frame, 2*i); + + if (i % 2 == modulo) { + rifo_in(&rifo, frame, init_next_out_fn + i); + } } for (int i = 0; i < 10; i++) { @@ -48,14 +51,15 @@ { struct frame_rifo rifo; frame_rifo_init(&rifo); + rifo.next_out_fn = init_next_out_fn; - printf("\nTEST: %s\n", __func__); + printf("\nTEST: %s, starting at FN: %u\n", __func__, init_next_out_fn); const uint8_t in[] = { 0, 1, 4, 3, 5, 2, 6, 7, 8, 9 }; for (int i = 0; i < sizeof(in); i++) { uint8_t frame[32]; memset(frame, in[i], sizeof(frame)); - rifo_in(&rifo, frame, in[i]); + rifo_in(&rifo, frame, init_next_out_fn + in[i]); } for (int i = 0; i < 10; i++) { @@ -65,12 +69,82 @@ } } +static void correct_order(void) +{ + struct frame_rifo rifo; + frame_rifo_init(&rifo); + rifo.next_out_fn = init_next_out_fn; + + printf("\nTEST: %s, starting at FN: %u\n", __func__, init_next_out_fn); + + const uint8_t in[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; + for (int i = 0; i < sizeof(in); i++) { + uint8_t frame[32]; + memset(frame, in[i], sizeof(frame)); + rifo_in(&rifo, frame, init_next_out_fn + in[i]); + } + + for (int i = 0; i < 10; i++) { + uint8_t frame[32]; + memset(frame, 0xff, sizeof(frame)); + rifo_out(&rifo, frame); + } +} + +static void too_old_frames(void) +{ + struct frame_rifo rifo; + frame_rifo_init(&rifo); + rifo.next_out_fn = init_next_out_fn; + + printf("\nTEST: %s, starting at FN: %u\n", __func__, init_next_out_fn); + + // Put 10 frames at absolute frame numbers 850-860 + // (to get outside of the 800 frame buffer) + const uint8_t in[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; + for (int i = 0; i < sizeof(in); i++) { + uint8_t frame[32]; + memset(frame, in[i], sizeof(frame)); + rifo_in(&rifo, frame, init_next_out_fn + in[i] + 850); + } + + // Skip the first 850 frames + for (int i = 0; i < 850; i++) { + uint8_t frame[32]; + memset(frame, 0xff, sizeof(frame)); + // Note: frame_rifo_out instead of rifo_out + // (just to ignore the output) + frame_rifo_out(&rifo, frame); + } + + // Try to read the 10 real frames (which shouldn't be in the buffer) + for (int i = 0; i < 10; i++) { + uint8_t frame[32]; + memset(frame, 0xff, sizeof(frame)); + rifo_out(&rifo, frame); + } +} + +void run_all_tests(void) +{ + missing_frames(0); + missing_frames(1); + reordered_in(); + correct_order(); + too_old_frames(); +} int main(int argc, char **argv) { g_e1d_ctx = talloc_named_const(NULL, 0, "osmo-e1d"); osmo_init_logging2(g_e1d_ctx, &log_info); - missing_frames(); - reordered_in(); + + // run all tests starting with a framenumber of 0 + init_next_out_fn = 0; + run_all_tests(); + + // re-run all tests at the edge of a framenumber rollover + init_next_out_fn = 0xFFFFFFFF - 5; + run_all_tests(); } diff --git a/tests/rifo/rifo_test.ok b/tests/rifo/rifo_test.ok new file mode 100644 index 0000000..cf1b778 --- /dev/null +++ b/tests/rifo/rifo_test.ok @@ -0,0 +1,200 @@ + +TEST: missing_frames, starting at FN: 0 +RIFO_IN(0000000000000000000000000000000000000000000000000000000000000000, 0)=0 +RIFO_IN(0202020202020202020202020202020202020202020202020202020202020202, 2)=0 +RIFO_IN(0404040404040404040404040404040404040404040404040404040404040404, 4)=0 +RIFO_IN(0606060606060606060606060606060606060606060606060606060606060606, 6)=0 +RIFO_IN(0808080808080808080808080808080808080808080808080808080808080808, 8)=0 +RIFO_OUT(0000000000000000000000000000000000000000000000000000000000000000)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(0202020202020202020202020202020202020202020202020202020202020202)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(0404040404040404040404040404040404040404040404040404040404040404)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(0606060606060606060606060606060606060606060606060606060606060606)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(0808080808080808080808080808080808080808080808080808080808080808)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 + +TEST: missing_frames, starting at FN: 0 +RIFO_IN(0101010101010101010101010101010101010101010101010101010101010101, 1)=0 +RIFO_IN(0303030303030303030303030303030303030303030303030303030303030303, 3)=0 +RIFO_IN(0505050505050505050505050505050505050505050505050505050505050505, 5)=0 +RIFO_IN(0707070707070707070707070707070707070707070707070707070707070707, 7)=0 +RIFO_IN(0909090909090909090909090909090909090909090909090909090909090909, 9)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(0101010101010101010101010101010101010101010101010101010101010101)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(0303030303030303030303030303030303030303030303030303030303030303)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(0505050505050505050505050505050505050505050505050505050505050505)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(0707070707070707070707070707070707070707070707070707070707070707)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(0909090909090909090909090909090909090909090909090909090909090909)=0 + +TEST: reordered_in, starting at FN: 0 +RIFO_IN(0000000000000000000000000000000000000000000000000000000000000000, 0)=0 +RIFO_IN(0101010101010101010101010101010101010101010101010101010101010101, 1)=0 +RIFO_IN(0404040404040404040404040404040404040404040404040404040404040404, 4)=0 +RIFO_IN(0303030303030303030303030303030303030303030303030303030303030303, 3)=0 +RIFO_IN(0505050505050505050505050505050505050505050505050505050505050505, 5)=0 +RIFO_IN(0202020202020202020202020202020202020202020202020202020202020202, 2)=0 +RIFO_IN(0606060606060606060606060606060606060606060606060606060606060606, 6)=0 +RIFO_IN(0707070707070707070707070707070707070707070707070707070707070707, 7)=0 +RIFO_IN(0808080808080808080808080808080808080808080808080808080808080808, 8)=0 +RIFO_IN(0909090909090909090909090909090909090909090909090909090909090909, 9)=0 +RIFO_OUT(0000000000000000000000000000000000000000000000000000000000000000)=0 +RIFO_OUT(0101010101010101010101010101010101010101010101010101010101010101)=0 +RIFO_OUT(0202020202020202020202020202020202020202020202020202020202020202)=0 +RIFO_OUT(0303030303030303030303030303030303030303030303030303030303030303)=0 +RIFO_OUT(0404040404040404040404040404040404040404040404040404040404040404)=0 +RIFO_OUT(0505050505050505050505050505050505050505050505050505050505050505)=0 +RIFO_OUT(0606060606060606060606060606060606060606060606060606060606060606)=0 +RIFO_OUT(0707070707070707070707070707070707070707070707070707070707070707)=0 +RIFO_OUT(0808080808080808080808080808080808080808080808080808080808080808)=0 +RIFO_OUT(0909090909090909090909090909090909090909090909090909090909090909)=0 + +TEST: correct_order, starting at FN: 0 +RIFO_IN(0000000000000000000000000000000000000000000000000000000000000000, 0)=0 +RIFO_IN(0101010101010101010101010101010101010101010101010101010101010101, 1)=0 +RIFO_IN(0202020202020202020202020202020202020202020202020202020202020202, 2)=0 +RIFO_IN(0303030303030303030303030303030303030303030303030303030303030303, 3)=0 +RIFO_IN(0404040404040404040404040404040404040404040404040404040404040404, 4)=0 +RIFO_IN(0505050505050505050505050505050505050505050505050505050505050505, 5)=0 +RIFO_IN(0606060606060606060606060606060606060606060606060606060606060606, 6)=0 +RIFO_IN(0707070707070707070707070707070707070707070707070707070707070707, 7)=0 +RIFO_IN(0808080808080808080808080808080808080808080808080808080808080808, 8)=0 +RIFO_IN(0909090909090909090909090909090909090909090909090909090909090909, 9)=0 +RIFO_OUT(0000000000000000000000000000000000000000000000000000000000000000)=0 +RIFO_OUT(0101010101010101010101010101010101010101010101010101010101010101)=0 +RIFO_OUT(0202020202020202020202020202020202020202020202020202020202020202)=0 +RIFO_OUT(0303030303030303030303030303030303030303030303030303030303030303)=0 +RIFO_OUT(0404040404040404040404040404040404040404040404040404040404040404)=0 +RIFO_OUT(0505050505050505050505050505050505050505050505050505050505050505)=0 +RIFO_OUT(0606060606060606060606060606060606060606060606060606060606060606)=0 +RIFO_OUT(0707070707070707070707070707070707070707070707070707070707070707)=0 +RIFO_OUT(0808080808080808080808080808080808080808080808080808080808080808)=0 +RIFO_OUT(0909090909090909090909090909090909090909090909090909090909090909)=0 + +TEST: too_old_frames, starting at FN: 0 +RIFO_IN(0000000000000000000000000000000000000000000000000000000000000000, 850)=-34 +RIFO_IN(0101010101010101010101010101010101010101010101010101010101010101, 851)=-34 +RIFO_IN(0202020202020202020202020202020202020202020202020202020202020202, 852)=-34 +RIFO_IN(0303030303030303030303030303030303030303030303030303030303030303, 853)=-34 +RIFO_IN(0404040404040404040404040404040404040404040404040404040404040404, 854)=-34 +RIFO_IN(0505050505050505050505050505050505050505050505050505050505050505, 855)=-34 +RIFO_IN(0606060606060606060606060606060606060606060606060606060606060606, 856)=-34 +RIFO_IN(0707070707070707070707070707070707070707070707070707070707070707, 857)=-34 +RIFO_IN(0808080808080808080808080808080808080808080808080808080808080808, 858)=-34 +RIFO_IN(0909090909090909090909090909090909090909090909090909090909090909, 859)=-34 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 + +TEST: missing_frames, starting at FN: 4294967290 +RIFO_IN(0000000000000000000000000000000000000000000000000000000000000000, 4294967290)=0 +RIFO_IN(0202020202020202020202020202020202020202020202020202020202020202, 4294967292)=0 +RIFO_IN(0404040404040404040404040404040404040404040404040404040404040404, 4294967294)=0 +RIFO_IN(0606060606060606060606060606060606060606060606060606060606060606, 0)=0 +RIFO_IN(0808080808080808080808080808080808080808080808080808080808080808, 2)=0 +RIFO_OUT(0000000000000000000000000000000000000000000000000000000000000000)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(0202020202020202020202020202020202020202020202020202020202020202)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(0404040404040404040404040404040404040404040404040404040404040404)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(0606060606060606060606060606060606060606060606060606060606060606)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(0808080808080808080808080808080808080808080808080808080808080808)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 + +TEST: missing_frames, starting at FN: 4294967290 +RIFO_IN(0101010101010101010101010101010101010101010101010101010101010101, 4294967291)=0 +RIFO_IN(0303030303030303030303030303030303030303030303030303030303030303, 4294967293)=0 +RIFO_IN(0505050505050505050505050505050505050505050505050505050505050505, 4294967295)=0 +RIFO_IN(0707070707070707070707070707070707070707070707070707070707070707, 1)=0 +RIFO_IN(0909090909090909090909090909090909090909090909090909090909090909, 3)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(0101010101010101010101010101010101010101010101010101010101010101)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(0303030303030303030303030303030303030303030303030303030303030303)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(0505050505050505050505050505050505050505050505050505050505050505)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(0707070707070707070707070707070707070707070707070707070707070707)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(0909090909090909090909090909090909090909090909090909090909090909)=0 + +TEST: reordered_in, starting at FN: 4294967290 +RIFO_IN(0000000000000000000000000000000000000000000000000000000000000000, 4294967290)=0 +RIFO_IN(0101010101010101010101010101010101010101010101010101010101010101, 4294967291)=0 +RIFO_IN(0404040404040404040404040404040404040404040404040404040404040404, 4294967294)=0 +RIFO_IN(0303030303030303030303030303030303030303030303030303030303030303, 4294967293)=0 +RIFO_IN(0505050505050505050505050505050505050505050505050505050505050505, 4294967295)=0 +RIFO_IN(0202020202020202020202020202020202020202020202020202020202020202, 4294967292)=0 +RIFO_IN(0606060606060606060606060606060606060606060606060606060606060606, 0)=0 +RIFO_IN(0707070707070707070707070707070707070707070707070707070707070707, 1)=0 +RIFO_IN(0808080808080808080808080808080808080808080808080808080808080808, 2)=0 +RIFO_IN(0909090909090909090909090909090909090909090909090909090909090909, 3)=0 +RIFO_OUT(0000000000000000000000000000000000000000000000000000000000000000)=0 +RIFO_OUT(0101010101010101010101010101010101010101010101010101010101010101)=0 +RIFO_OUT(0202020202020202020202020202020202020202020202020202020202020202)=0 +RIFO_OUT(0303030303030303030303030303030303030303030303030303030303030303)=0 +RIFO_OUT(0404040404040404040404040404040404040404040404040404040404040404)=0 +RIFO_OUT(0505050505050505050505050505050505050505050505050505050505050505)=0 +RIFO_OUT(0606060606060606060606060606060606060606060606060606060606060606)=0 +RIFO_OUT(0707070707070707070707070707070707070707070707070707070707070707)=0 +RIFO_OUT(0808080808080808080808080808080808080808080808080808080808080808)=0 +RIFO_OUT(0909090909090909090909090909090909090909090909090909090909090909)=0 + +TEST: correct_order, starting at FN: 4294967290 +RIFO_IN(0000000000000000000000000000000000000000000000000000000000000000, 4294967290)=0 +RIFO_IN(0101010101010101010101010101010101010101010101010101010101010101, 4294967291)=0 +RIFO_IN(0202020202020202020202020202020202020202020202020202020202020202, 4294967292)=0 +RIFO_IN(0303030303030303030303030303030303030303030303030303030303030303, 4294967293)=0 +RIFO_IN(0404040404040404040404040404040404040404040404040404040404040404, 4294967294)=0 +RIFO_IN(0505050505050505050505050505050505050505050505050505050505050505, 4294967295)=0 +RIFO_IN(0606060606060606060606060606060606060606060606060606060606060606, 0)=0 +RIFO_IN(0707070707070707070707070707070707070707070707070707070707070707, 1)=0 +RIFO_IN(0808080808080808080808080808080808080808080808080808080808080808, 2)=0 +RIFO_IN(0909090909090909090909090909090909090909090909090909090909090909, 3)=0 +RIFO_OUT(0000000000000000000000000000000000000000000000000000000000000000)=0 +RIFO_OUT(0101010101010101010101010101010101010101010101010101010101010101)=0 +RIFO_OUT(0202020202020202020202020202020202020202020202020202020202020202)=0 +RIFO_OUT(0303030303030303030303030303030303030303030303030303030303030303)=0 +RIFO_OUT(0404040404040404040404040404040404040404040404040404040404040404)=0 +RIFO_OUT(0505050505050505050505050505050505050505050505050505050505050505)=0 +RIFO_OUT(0606060606060606060606060606060606060606060606060606060606060606)=0 +RIFO_OUT(0707070707070707070707070707070707070707070707070707070707070707)=0 +RIFO_OUT(0808080808080808080808080808080808080808080808080808080808080808)=0 +RIFO_OUT(0909090909090909090909090909090909090909090909090909090909090909)=0 + +TEST: too_old_frames, starting at FN: 4294967290 +RIFO_IN(0000000000000000000000000000000000000000000000000000000000000000, 844)=-34 +RIFO_IN(0101010101010101010101010101010101010101010101010101010101010101, 845)=-34 +RIFO_IN(0202020202020202020202020202020202020202020202020202020202020202, 846)=-34 +RIFO_IN(0303030303030303030303030303030303030303030303030303030303030303, 847)=-34 +RIFO_IN(0404040404040404040404040404040404040404040404040404040404040404, 848)=-34 +RIFO_IN(0505050505050505050505050505050505050505050505050505050505050505, 849)=-34 +RIFO_IN(0606060606060606060606060606060606060606060606060606060606060606, 850)=-34 +RIFO_IN(0707070707070707070707070707070707070707070707070707070707070707, 851)=-34 +RIFO_IN(0808080808080808080808080808080808080808080808080808080808080808, 852)=-34 +RIFO_IN(0909090909090909090909090909090909090909090909090909090909090909, 853)=-34 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27715 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I930b4361924b2e8bcb566eb7ee64f36e06bc7745 Gerrit-Change-Number: 27715 Gerrit-PatchSet: 1 Gerrit-Owner: manawyrm <osmocom.account(a)tbspace.de> Gerrit-MessageType: newchange

3 years, 5 months

1
0
0 0

Change in osmo-e1d[master]: WIP: RIFO (random in, first out) for IP->E1 direction

by manawyrm

manawyrm has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27713 ) Change subject: WIP: RIFO (random in, first out) for IP->E1 direction ...................................................................... WIP: RIFO (random in, first out) for IP->E1 direction In the past, we used a FIFO structure (first in, first out) - which obviously cannot deal with packet re-ordering on the IP side. This patch introduces a new "RIFO" as a replacement for the FIFO. The RIFO is able to reconstruct E1 frame ordering by using the reduced frame number from the TDMoIP messages, at least as long as the related frame number range is within the current RIFO depth. Change-Id: I22256870114cb85e4e10932554478be7061e086b --- M .gitignore M Makefile.am M configure.ac M src/octoi/Makefile.am M src/octoi/e1oip.c M src/octoi/e1oip.h M src/octoi/frame_fifo.h A src/octoi/frame_rifo.c A src/octoi/frame_rifo.h M src/octoi/octoi.c A tests/Makefile.am A tests/rifo/Makefile.am A tests/rifo/rifo_test.c A tests/testsuite.at 14 files changed, 462 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/13/27713/1 diff --git a/.gitignore b/.gitignore index 7816fd5..04b03bd 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,11 @@ src/osmo-e1d-pipe contrib/e1-prbs-test/e1-prbs-test contrib/e1-prbs-test/ice40-e1-prbs-check + +tests/atconfig +tests/atlocal +tests/package.m4 +tests/testsuite +tests/testsuite.log +tests/testsuite.dir +tests/*/*_test diff --git a/Makefile.am b/Makefile.am index 5027905..92ed7d2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,6 +5,7 @@ doc \ src \ include \ + tests \ $(NULL) EXTRA_DIST = \ diff --git a/configure.ac b/configure.ac index 5a09386..2611506 100644 --- a/configure.ac +++ b/configure.ac @@ -9,6 +9,7 @@ LT_INIT AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip 1.9]) +AC_CONFIG_TESTDIR(tests) CFLAGS="$CFLAGS -std=gnu11" @@ -74,6 +75,26 @@ CPPFLAGS="$CPPFLAGS $WERROR_FLAGS" fi +AC_ARG_ENABLE([external_tests], + AC_HELP_STRING([--enable-external-tests], + [Include the VTY/CTRL tests in make check [default=no]]), + [enable_ext_tests="$enableval"],[enable_ext_tests="no"]) +if test "x$enable_ext_tests" = "xyes" ; then + AC_CHECK_PROG(PYTHON3_AVAIL,python3,yes) + if test "x$PYTHON3_AVAIL" != "xyes" ; then + AC_MSG_ERROR([Please install python3 to run the VTY/CTRL tests.]) + fi + AC_CHECK_PROG(OSMOTESTEXT_CHECK,osmotestvty.py,yes) + if test "x$OSMOTESTEXT_CHECK" != "xyes" ; then + AC_MSG_ERROR([Please install git://osmocom.org/python/osmo-python-tests to run the VTY/CTRL tests.]) + fi +fi +AC_MSG_CHECKING([whether to enable VTY/CTRL tests]) +AC_MSG_RESULT([$enable_ext_tests]) +AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes") + + + # https://www.freedesktop.org/software/systemd/man/daemon.html AC_ARG_WITH([systemdsystemunitdir], [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, @@ -99,6 +120,8 @@ src/Makefile src/octoi/Makefile include/Makefile + tests/Makefile + tests/rifo/Makefile libosmo-e1d.pc libosmo-octoi.pc ) diff --git a/src/octoi/Makefile.am b/src/octoi/Makefile.am index b77e0b8..d3fe968 100644 --- a/src/octoi/Makefile.am +++ b/src/octoi/Makefile.am @@ -11,6 +11,7 @@ libosmo_octoi_la_SOURCES = \ frame_fifo.c \ + frame_rifo.c \ e1oip.c \ octoi.c \ octoi_sock.c \ @@ -28,6 +29,7 @@ noinst_HEADERS = \ e1oip.h \ frame_fifo.h \ + frame_rifo.h \ octoi.h \ octoi_fsm.h \ octoi_sock.h \ diff --git a/src/octoi/e1oip.c b/src/octoi/e1oip.c index 0cb7206..176db01 100644 --- a/src/octoi/e1oip.c +++ b/src/octoi/e1oip.c @@ -168,11 +168,13 @@ struct octoi_peer *peer = iline->peer; const struct e1oip_tdm_hdr *e1th; uint16_t frame_nr; + uint32_t fn32; uint32_t ts_mask; uint8_t idx2ts[BYTES_PER_FRAME]; unsigned int n_frames; uint8_t frame_buf[BYTES_PER_FRAME]; unsigned int num_ts; + uint16_t exp_next_seq = iline->e1t.next_fn32 & 0xffff; struct timespec ts; /* update the timestamp at which we last received data from this peer */ @@ -191,10 +193,33 @@ frame_nr = ntohs(e1th->frame_nr); ts_mask = ntohl(e1th->ts_mask); - if (frame_nr != iline->e1t.next_seq) { - LOGPEER(peer, LOGL_NOTICE, "RxIP: frame_nr=%u, but expected %u: packet loss? " - "or re-ordering?\n", frame_nr, iline->e1t.next_seq); - /* FIXME: locally substitute frames? */ + if (frame_nr != exp_next_seq) { + int delta = frame_nr - exp_next_seq; + bool re_ordering; + if (delta > 0 && delta < 5 * iline->cfg.batching_factor) { + /* assume re-ordering */ + re_ordering = true; + } else { + /* assume packet loss */ + re_ordering = false; + } + + LOGPEER(peer, LOGL_NOTICE, "RxIP: frame_nr=%u, but expected %u: delta=%d - assuming %s\n", + frame_nr, exp_next_seq, delta, re_ordering ? "re-ordering" : "packet loss"); + + fn32 = (iline->e1t.next_fn32 & 0xffff0000) + frame_nr; + if (fn32 > iline->e1t.next_fn32 + 8000) { + /* more than 1s in the future: was this a wrap-around? */ + fn32 = ((iline->e1t.next_fn32 & 0xffff0000) - 0x10000) + frame_nr; + if (fn32 < iline->e1t.next_fn32 - 8000) { + /* also no match: give up */ + LOGPEER(peer, LOGL_NOTICE, "RxIP: frame_nr=%u at exp_next_fn32=%u; " + "received frame outside +/- 1s window of expected frame\n", + frame_nr, iline->e1t.next_fn32); + } + } + } else { + fn32 = iline->e1t.next_fn32; } /* compute E1oIP idx to timeslot table */ @@ -223,13 +248,15 @@ frame_buf[ts_nr] = e1th->data[i*num_ts + j]; } /* FIXME: what to do about TS0? */ - frame_fifo_in(&iline->e1t.fifo, frame_buf); + frame_rifo_in(&iline->e1t.rifo, frame_buf, fn32+i); } /* update local state */ memcpy(iline->e1t.last_frame, frame_buf, BYTES_PER_FRAME); - iline->e1t.next_seq = frame_nr + n_frames; + /* FIXME: only in some cases */ + //if (fn32 >= iline->e1t.next_fn32I + iline->e1t.next_fn32 = fn32 + n_frames; - iline_stat_set(iline, LINE_STAT_E1oIP_E1T_FIFO, frame_fifo_frames(&iline->e1t.fifo)); + //iline_stat_set(iline, LINE_STAT_E1oIP_E1T_FIFO, frame_fifo_frames(&iline->e1t.fifo)); return 0; } @@ -258,7 +285,7 @@ frame_fifo_init(&iline->e1o.fifo, iline->cfg.batching_factor, fifo_threshold_cb, iline); memset(&iline->e1o.last_frame, 0xff, sizeof(iline->e1o.last_frame)); - frame_fifo_init(&iline->e1t.fifo, 0, NULL, iline); + frame_rifo_init(&iline->e1t.rifo); memset(&iline->e1t.last_frame, 0xff, sizeof(iline->e1o.last_frame)); iline->peer = peer; diff --git a/src/octoi/e1oip.h b/src/octoi/e1oip.h index e08e3ca..50ed9ff 100644 --- a/src/octoi/e1oip.h +++ b/src/octoi/e1oip.h @@ -7,6 +7,7 @@ #include <osmocom/octoi/e1oip_proto.h> #include "frame_fifo.h" +#include "frame_rifo.h" #define iline_ctr_add(iline, idx, add) rate_ctr_add(rate_ctr_group_get_ctr((iline)->ctrs, idx), add) #define iline_stat_set(iline, idx, add) \ @@ -47,9 +48,9 @@ /* E1 terminated side (E1<-IP) */ struct { - struct frame_fifo fifo; + struct frame_rifo rifo; uint8_t last_frame[BYTES_PER_FRAME]; /* last frame on the E1 side */ - uint16_t next_seq; /* next expected sequence nr */ + uint32_t next_fn32; /* next expected frame number */ } e1t; /* TODO: statistics (RTT, frame loss, std deviation, alarms */ diff --git a/src/octoi/frame_fifo.h b/src/octoi/frame_fifo.h index 64aa06a..ee9f079 100644 --- a/src/octoi/frame_fifo.h +++ b/src/octoi/frame_fifo.h @@ -1,5 +1,8 @@ #pragma once +#include <stdint.h> +#include <stddef.h> + #define BYTES_PER_FRAME 32 #define FRAMES_PER_FIFO 800 diff --git a/src/octoi/frame_rifo.c b/src/octoi/frame_rifo.c new file mode 100644 index 0000000..0ddaae5 --- /dev/null +++ b/src/octoi/frame_rifo.c @@ -0,0 +1,153 @@ +/* + * frame_rifo.c + * + * This is for the IP -> E1 direction, where IP packets may arrive with + * re-ordering. So this "Random [order] In, First Out' is reconstructing + * the original order. + * + * (C) 2022 by Harald Welte <laforge(a)osmocom.org> + * + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include <errno.h> +#include <unistd.h> +#include <stdint.h> +#include <string.h> +#include <sys/types.h> +#include <sys/socket.h> + +#include <osmocom/core/utils.h> + +#include "frame_rifo.h" + + +/*********************************************************************** + * Frame RIFO + ***********************************************************************/ + +/* return the absolute bucket number (0.. FRAMES_PER_FIFO-1) for given fn */ +static inline uint32_t bucket_for_fn(const struct frame_rifo *rifo, uint32_t fn) +{ + uint32_t next_out_bucket = (rifo->next_out - rifo->buf) / BYTES_PER_FRAME; + /* offset in frames compared to next_out */ + uint32_t offset = fn - rifo->next_out_fn % FRAMES_PER_FIFO; + return (next_out_bucket + offset) % FRAMES_PER_FIFO; +} + +/* set the bucket bit for given bucket number */ +static void bucket_bit_set(struct frame_rifo *rifo, uint32_t bucket_nr) +{ + uint8_t byte = bucket_nr/8; + uint8_t bit = bucket_nr%8; + + OSMO_ASSERT(byte < sizeof(rifo->bitvec)); + + rifo->bitvec[byte] |= (1 << bit); +} + +/* clear the bucket bit for given bucket number */ +static void bucket_bit_clear(struct frame_rifo *rifo, uint32_t bucket_nr) +{ + uint8_t byte = bucket_nr/8; + uint8_t bit = bucket_nr%8; + + OSMO_ASSERT(byte < sizeof(rifo->bitvec)); + + rifo->bitvec[byte] &= ~(1 << bit); +} + +/* is the given bucket bit number set? */ +static bool bucket_bit_get(struct frame_rifo *rifo, uint32_t bucket_nr) +{ + uint8_t byte = bucket_nr/8; + uint8_t bit = bucket_nr%8; + + OSMO_ASSERT(byte < sizeof(rifo->bitvec)); + + return rifo->bitvec[byte] & (1 << bit); +} + +void rifo_dump(struct frame_rifo *rifo) +{ + printf("buf=%p, size=%zu, next_out=%lu, next_out_fn=%u\n", rifo->buf, sizeof(rifo->buf), + rifo->next_out - rifo->buf, rifo->next_out_fn); +} + +/*! Initialize a frame RIFO. + * \param rifo Caller-allocated memory for RIFO data structure */ +void frame_rifo_init(struct frame_rifo *rifo) +{ + memset(rifo->buf, 0xff, sizeof(rifo->buf)); + rifo->next_out = rifo->buf; + rifo->next_out_fn = 0; + memset(rifo->bitvec, 0, sizeof(rifo->bitvec)); +} + +#define RIFO_BUF_END(f) ((f)->buf + sizeof((f)->buf)) + +/*! put one received frame into the RIFO at a given specified frame number. + * \param rifo The RIFO to which we want to put (append) multiple frames + * \param frame Pointer to memory containing the frame data + * \param fn Absolute frame number at which to insert the frame. + * \returns 0 on success; -1 on error (overflow */ +int frame_rifo_in(struct frame_rifo *rifo, const uint8_t *frame, uint32_t fn) +{ + uint32_t bucket; + uint8_t *dst; + + if (fn > frame_rifo_max_in_fn(rifo)) + return -ERANGE; + + bucket = bucket_for_fn(rifo, fn); + dst = rifo->buf + bucket * BYTES_PER_FRAME; + OSMO_ASSERT(dst + BYTES_PER_FRAME <= RIFO_BUF_END(rifo)); + memcpy(dst, frame, BYTES_PER_FRAME); + bucket_bit_set(rifo, bucket); + + return 0; +} + + +/*! pull one frames out of the RIFO. + * \param rifo The RIFO from which we want to pull frames + * \param out Caller-allocated output buffer + * \returns 0 on success; -1 on error (no frame available) */ +int frame_rifo_out(struct frame_rifo *rifo, uint8_t *out) +{ + uint32_t next_out_bucket = (rifo->next_out - rifo->buf) / BYTES_PER_FRAME; + bool bucket_bit = bucket_bit_get(rifo, next_out_bucket); + int rc = 0; + + if (!bucket_bit) { + /* caller is supposed to copy/duplicate previous frame */ + rc = -1; + } else { + memcpy(out, rifo->next_out, BYTES_PER_FRAME); + bucket_bit_clear(rifo, next_out_bucket); + } + + /* advance by one frame */ + rifo->next_out += BYTES_PER_FRAME; + rifo->next_out_fn += 1; + if (rifo->next_out >= RIFO_BUF_END(rifo)) + rifo->next_out -= sizeof(rifo->buf); + + return rc; +} diff --git a/src/octoi/frame_rifo.h b/src/octoi/frame_rifo.h new file mode 100644 index 0000000..22379ac --- /dev/null +++ b/src/octoi/frame_rifo.h @@ -0,0 +1,43 @@ +#pragma once + +#include "frame_fifo.h" + +struct frame_rifo { + uint8_t *next_out; /* where to read next output from FIFO */ + + uint8_t buf[BYTES_PER_FRAME * FRAMES_PER_FIFO]; + + uint32_t next_out_fn; /* frame number of next output frame */ + uint8_t bitvec[FRAMES_PER_FIFO/8]; + /* bit-vector of occupied (data received) slots in FIFO, + indexed by physical offset in buf */ +}; + +/* maximum frame number we currently can store in the rifo */ +static inline uint32_t frame_rifo_max_in_fn(const struct frame_rifo *ff) +{ + return ff->next_out_fn + FRAMES_PER_FIFO - 1; +} + +void frame_rifo_init(struct frame_rifo *rifo); + +/* number of frames currently available in FIFO */ +static inline unsigned int frame_rifo_frames(struct frame_rifo *rifo) +{ + unsigned int byte, bit; + unsigned int frame_count = 0; + + for (byte = 0; byte < sizeof(rifo->bitvec); byte++) { + for (bit = 0; bit < 8; bit++) { + if (rifo->bitvec[byte] & (1 << bit)) + frame_count++; + } + } + return frame_count; +} + +/* put a received frame into the FIFO */ +int frame_rifo_in(struct frame_rifo *rifo, const uint8_t *frame, uint32_t fn); + +/* pull one frame out of the FIFO */ +int frame_rifo_out(struct frame_rifo *rifo, uint8_t *out); diff --git a/src/octoi/octoi.c b/src/octoi/octoi.c index a2c4ca6..3137b75 100644 --- a/src/octoi/octoi.c +++ b/src/octoi/octoi.c @@ -120,12 +120,12 @@ for (int i = 0; i < fts; i++) { uint8_t *cur = buf + BYTES_PER_FRAME*i; - rc = frame_fifo_out(&iline->e1t.fifo, cur); + rc = frame_rifo_out(&iline->e1t.rifo, cur); if (rc < 0) { iline_ctr_add(iline, LINE_CTR_E1oIP_UNDERRUN, 1); /* substitute with last received frame */ memcpy(cur, iline->e1t.last_frame, BYTES_PER_FRAME); } } - iline_stat_set(iline, LINE_STAT_E1oIP_E1T_FIFO, frame_fifo_frames(&iline->e1t.fifo)); + //iline_stat_set(iline, LINE_STAT_E1oIP_E1T_FIFO, frame_fifo_frames(&iline->e1t.fifo)); } diff --git a/tests/Makefile.am b/tests/Makefile.am new file mode 100644 index 0000000..3e6a5ba --- /dev/null +++ b/tests/Makefile.am @@ -0,0 +1,75 @@ +SUBDIRS = \ + rifo \ + $(NULL) + +# The `:;' works around a Bash 3.2 bug when the output is not writeable. +$(srcdir)/package.m4: $(top_srcdir)/configure.ac + :;{ \ + echo '# Signature of the current package.' && \ + echo 'm4_define([AT_PACKAGE_NAME],' && \ + echo ' [$(PACKAGE_NAME)])' && \ + echo 'm4_define([AT_PACKAGE_TARNAME],' && \ + echo ' [$(PACKAGE_TARNAME)])' && \ + echo 'm4_define([AT_PACKAGE_VERSION],' && \ + echo ' [$(PACKAGE_VERSION)])' && \ + echo 'm4_define([AT_PACKAGE_STRING],' && \ + echo ' [$(PACKAGE_STRING)])' && \ + echo 'm4_define([AT_PACKAGE_BUGREPORT],' && \ + echo ' [$(PACKAGE_BUGREPORT)])'; \ + echo 'm4_define([AT_PACKAGE_URL],' && \ + echo ' [$(PACKAGE_URL)])'; \ + } >'$(srcdir)/package.m4' + +EXTRA_DIST = \ + testsuite.at \ + $(srcdir)/package.m4 \ + $(TESTSUITE) \ + $(NULL) + +TESTSUITE = $(srcdir)/testsuite + +DISTCLEANFILES = \ + atconfig \ + $(NULL) + +if ENABLE_EXT_TESTS +python-tests: $(BUILT_SOURCES) + $(MAKE) vty-test + osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v + osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v + $(srcdir)/vty_test_runner.py -w $(abs_top_builddir) -v + $(srcdir)/ctrl_test_runner.py -w $(abs_top_builddir) -v +else +python-tests: $(BUILT_SOURCES) + echo "Not running python-based tests (determined at configure-time)" +endif + +# Run a specific test with: 'make vty-test VTY_TEST=osmo-e1d.vty' +VTY_TEST ?= *.vty + +# To update the VTY script from current application behavior, +# pass -u to vty_script_runner.py by doing: +# make vty-test U=-u +vty-test: + osmo_verify_transcript_vty.py -v \ + -n osmo-e1d -p 4239 \ + -r "$(top_builddir)/src/osmo-e1d/osmo-e1d -c $(top_srcdir)/doc/examples/osmo-e1d/osmo-e1d-vpair.cfg" \ + $(U) $(srcdir)/$(VTY_TEST) + +check-local: atconfig $(TESTSUITE) + $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) + $(MAKE) $(AM_MAKEFLAGS) python-tests + +installcheck-local: atconfig $(TESTSUITE) + $(SHELL) '$(TESTSUITE)' AUTOTEST_PATH='$(bindir)' \ + $(TESTSUITEFLAGS) + +clean-local: + test ! -f '$(TESTSUITE)' || \ + $(SHELL) '$(TESTSUITE)' --clean + +AUTOM4TE = $(SHELL) $(top_srcdir)/missing --run autom4te +AUTOTEST = $(AUTOM4TE) --language=autotest +$(TESTSUITE): $(srcdir)/testsuite.at $(srcdir)/package.m4 + $(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at + mv $@.tmp $@ diff --git a/tests/rifo/Makefile.am b/tests/rifo/Makefile.am new file mode 100644 index 0000000..17924ee --- /dev/null +++ b/tests/rifo/Makefile.am @@ -0,0 +1,30 @@ +AM_CPPFLAGS = \ + $(all_includes) \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/octoi \ + $(NULL) + +AM_CFLAGS = \ + -Wall \ + -ggdb3 \ + $(LIBOSMOCORE_CFLAGS) \ + $(NULL) + +EXTRA_DIST = \ + rifo_test.ok \ + $(NULL) + +noinst_PROGRAMS = \ + rifo_test \ + $(NULL) + +rifo_test_SOURCES = \ + rifo_test.c \ + $(NULL) + +rifo_test_LDADD = \ + $(top_builddir)/src/octoi/frame_rifo.o \ + $(top_builddir)/src/log.o \ + $(LIBOSMOCORE_LIBS) \ + $(NULL) diff --git a/tests/rifo/rifo_test.c b/tests/rifo/rifo_test.c new file mode 100644 index 0000000..c656c97 --- /dev/null +++ b/tests/rifo/rifo_test.c @@ -0,0 +1,76 @@ +#include <stdint.h> +#include <string.h> + +#include <osmocom/core/application.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/utils.h> + +#include "log.h" +#include "frame_rifo.h" + +static void *g_e1d_ctx; + +static void rifo_in(struct frame_rifo *rifo, uint8_t *frame, uint32_t fn) +{ + printf("RIFO_IN(%s, %u)\n", osmo_hexdump_nospc(frame, BYTES_PER_FRAME), fn); + OSMO_ASSERT(frame_rifo_in(rifo, frame, fn) == 0); +} + +static int rifo_out(struct frame_rifo *rifo, uint8_t *out) +{ + int rc = frame_rifo_out(rifo, out); + printf("RIFO_OUT(%s)=%d\n", osmo_hexdump_nospc(out, BYTES_PER_FRAME), rc); + return rc; +} + + +static void missing_frames(void) +{ + struct frame_rifo rifo; + frame_rifo_init(&rifo); + + printf("\nTEST: %s\n", __func__); + + for (int i = 0; i < 10; i++) { + uint8_t frame[32]; + memset(frame, i, sizeof(frame)); + rifo_in(&rifo, frame, 2*i); + } + + for (int i = 0; i < 10; i++) { + uint8_t frame[32]; + memset(frame, 0xff, sizeof(frame)); + rifo_out(&rifo, frame); + } +} + +static void reordered_in(void) +{ + struct frame_rifo rifo; + frame_rifo_init(&rifo); + + printf("\nTEST: %s\n", __func__); + + const uint8_t in[] = { 0, 1, 4, 3, 5, 2, 6, 7, 8, 9 }; + for (int i = 0; i < sizeof(in); i++) { + uint8_t frame[32]; + memset(frame, in[i], sizeof(frame)); + rifo_in(&rifo, frame, in[i]); + } + + for (int i = 0; i < 10; i++) { + uint8_t frame[32]; + memset(frame, 0xff, sizeof(frame)); + rifo_out(&rifo, frame); + } +} + + +int main(int argc, char **argv) +{ + g_e1d_ctx = talloc_named_const(NULL, 0, "osmo-e1d"); + osmo_init_logging2(g_e1d_ctx, &log_info); + missing_frames(); + reordered_in(); + +} diff --git a/tests/testsuite.at b/tests/testsuite.at new file mode 100644 index 0000000..9a60646 --- /dev/null +++ b/tests/testsuite.at @@ -0,0 +1,8 @@ +AT_INIT +AT_BANNER([Regression tests.]) + +AT_SETUP([rifo]) +AT_KEYWORDS([rifo]) +cat $abs_srcdir/rifo/rifo_test.ok > expout +AT_CHECK([$abs_top_builddir/tests/rifo/rifo_test], [], [expout], [ignore]) +AT_CLEANUP -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27713 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I22256870114cb85e4e10932554478be7061e086b Gerrit-Change-Number: 27713 Gerrit-PatchSet: 1 Gerrit-Owner: manawyrm <osmocom.account(a)tbspace.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 5 months

1
0
0 0

Change in osmo-bsc-nat[master]: main: use osmo_fsm_set_dealloc_ctx(OTC_SELECT)

by fixeria

Attention is currently required from: osmith, neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27709 ) Change subject: main: use osmo_fsm_set_dealloc_ctx(OTC_SELECT) ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27709 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I97abf88fa64cc1a4906f356c57912593d4366a37 Gerrit-Change-Number: 27709 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Fri, 08 Apr 2022 21:46:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in osmo-bsc-nat[master]: Initialize MGW pool on start up

by fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27707 ) Change subject: Initialize MGW pool on start up ...................................................................... Patch Set 2: Code-Review+2 (1 comment) Patchset: PS2: > It would be great adding some VTY unit tests (.vty files). IMO, VTY commands registered from a library should not be tested in projects using them. Instead, they should be tested in the library itself. This way we avoid failures when e.g. a command gets deprecated or its syntax gets extended. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I6030a1f5a9d5fb06f148b2a2e03ae57bcb6b3766 Gerrit-Change-Number: 27707 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 08 Apr 2022 21:44:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in osmo-bsc-nat[master]: bssap.h, subscr_conn.h: fix missing includes

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27706 ) Change subject: bssap.h, subscr_conn.h: fix missing includes ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27706 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: Ieb048c0f299bca1b194979c26cbeadbc81dee05f Gerrit-Change-Number: 27706 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 08 Apr 2022 21:40:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in osmo-bsc-nat[master]: README: osmo-dev: add BSC{0,1}_CODEC_LIST="fr2"

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27705 ) Change subject: README: osmo-dev: add BSC{0,1}_CODEC_LIST="fr2" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27705 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I78d666ad77c03459f5369b64e651e47ce1d4f12c Gerrit-Change-Number: 27705 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 08 Apr 2022 21:40:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in osmo-bsc-nat[master]: bssap: forward paging from MSC to all BSCs

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27704 ) Change subject: bssap: forward paging from MSC to all BSCs ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I2532d94aab82d136b932d57fa53c8ecf2d8d1fd9 Gerrit-Change-Number: 27704 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 08 Apr 2022 21:39:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in osmo-bts[master]: VTY: fix NULL-pointer dereference in 'show transceiver'

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27693 ) Change subject: VTY: fix NULL-pointer dereference in 'show transceiver' ...................................................................... Patch Set 1: (1 comment) File src/osmo-bts-trx/trx_vty.c: https://gerrit.osmocom.org/c/osmo-bts/+/27693/comment/d2832644_c3d98424 PS1, Line 98: if (l1ts == NULL) is that the RSL link missing? then why checking it for each l1ts instead of skipping the whole trx? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I403a027f064a4898eb74a11381bab3c884ec8ccf Gerrit-Change-Number: 27693 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: Fri, 08 Apr 2022 21:36:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in osmo-bts[master]: power_ctrl_params_def_reset(): set .ctrl_interval for both UL/DL

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27696 ) Change subject: power_ctrl_params_def_reset(): set .ctrl_interval for both UL/DL ...................................................................... power_ctrl_params_def_reset(): set .ctrl_interval for both UL/DL For the sake of consistency and code readability, initialize the power loop control interval (P_Con_INTERVAL) for both Uplink and Downlink directions in the same function. Change-Id: If7c804e51eb104d9fe73294a3867ab3b551d83c3 --- M src/common/power_control.c 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/power_control.c b/src/common/power_control.c index 42d9d07..0db5378 100644 --- a/src/common/power_control.c +++ b/src/common/power_control.c @@ -404,9 +404,6 @@ /* Default MS/BS Power Control parameters (see 3GPP TS 45.008, table A.1) */ const struct gsm_power_ctrl_params power_ctrl_params_def = { - - .ctrl_interval = 1, /* Trigger loop every second SACCH block. TS 45.008 sec 4.7.1 */ - /* Power increasing/reducing step size (optimal defaults) */ .inc_step_size_db = 4, /* quickly increase MS/BS power */ .red_step_size_db = 2, /* slowly decrease MS/BS power */ @@ -569,7 +566,10 @@ void power_ctrl_params_def_reset(struct gsm_power_ctrl_params *params, bool is_bs_pwr) { *params = power_ctrl_params_def; + + /* Trigger loop every N-th SACCH block. See 3GPP TS 45.008 section 4.7.1. */ if (!is_bs_pwr) - /* Trigger loop every fourth SACCH block (1.92s). TS 45.008 sec 4.7.1: */ - params->ctrl_interval = 2; + params->ctrl_interval = 2; /* N=4 (1.92s) */ + else + params->ctrl_interval = 1; /* N=2 (0.960) */ } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27696 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If7c804e51eb104d9fe73294a3867ab3b551d83c3 Gerrit-Change-Number: 27696 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 5 months

1
0
0 0

Change in osmo-bts[master]: power_ctrl_params_def_reset(): set .ctrl_interval for both UL/DL

by pespin

Attention is currently required from: osmith, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27696 ) Change subject: power_ctrl_params_def_reset(): set .ctrl_interval for both UL/DL ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27696 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If7c804e51eb104d9fe73294a3867ab3b551d83c3 Gerrit-Change-Number: 27696 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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: Fri, 08 Apr 2022 20:34:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2022