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

Build failure of network:osmocom:latest/osmo-iuh in openSUSE_Leap_15.1_ARM/armv7l

by OBS Notification

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/os… Package network:osmocom:latest/osmo-iuh failed to build in openSUSE_Leap_15.1_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-iuh Last lines of build log: [ 22s] [157/174] cumulate python3-base-3.6.5-lp151.5.1 [ 22s] [158/174] cumulate gcc-PIE-7-lp151.3.2 [ 22s] [159/174] cumulate libosmonetif-devel-1.1.0-lp151.2.2 [ 22s] [160/174] cumulate libosmoctrl-devel-1.6.0-lp151.1.1 [ 22s] [161/174] cumulate libosmogb-devel-1.6.0-lp151.1.1 [ 22s] [162/174] cumulate python3-3.6.5-lp151.5.1 [ 22s] [163/174] cumulate libosmo-sigtran7-1.5.0-lp151.1.1 [ 22s] [164/174] cumulate shadow-4.6-lp151.1.2 [ 22s] [165/174] cumulate sysuser-shadow-2.0-lp151.3.3 [ 22s] [166/174] cumulate libosmo-sigtran-devel-1.5.0-lp151.1.1 [ 22s] [167/174] cumulate system-group-hardware-20170617-lp151.4.3 [ 22s] [168/174] cumulate libutempter0-1.1.6-lp151.4.3 [ 22s] [169/174] cumulate util-linux-2.33.1-lp151.2.2 [ 22s] [170/174] cumulate aaa_base-84.87+git20180409.04c9dae-lp151.4.1 [ 22s] [171/174] cumulate systemd-234-lp151.25.2 [ 22s] [172/174] cumulate rpm-build-4.14.1-lp151.13.2 [ 22s] [173/174] cumulate aaa_base-malloccheck-84.87+git20180409.04c9dae-lp151.4.1 [ 22s] [174/174] cumulate post-build-checks-84.88+git20181015.ceb5c96-lp151.1.1 [ 22s] now installing cumulated packages [ 23s] Preparing... ######################################## [ 23s] file /usr/lib/libsystemd.so.0.19.0 conflicts between attempted installs of libsystemd0-234-lp151.25.2.armv7hl and libsystemd0-mini-234-lp151.25.2.armv7hl [ 23s] exit ... [ 23s] ### VM INTERACTION START ### [ 26s] [ 11.710806] sysrq: SysRq : Power Off [ 26s] [ 11.712596] reboot: Power down [ 26s] ### VM INTERACTION END ### [ 26s] [ 26s] armbuild21 failed "build osmo-iuh.spec" at Thu Jan 6 00:59:11 UTC 2022. [ 26s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

3 years, 5 months

1
0
0 0

Build failure of network:osmocom:latest/osmo-iuh in openSUSE_Leap_15.1/x86_64

by OBS Notification

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/os… Package network:osmocom:latest/osmo-iuh failed to build in openSUSE_Leap_15.1/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-iuh Last lines of build log: [ 9s] [163/179] cumulate gcc-PIE-7-lp151.3.5 [ 9s] [164/179] cumulate libosmonetif-devel-1.1.0-lp151.2.2 [ 9s] [165/179] cumulate libosmoctrl-devel-1.6.0-lp151.1.1 [ 9s] [166/179] cumulate libosmogb-devel-1.6.0-lp151.1.1 [ 9s] [167/179] cumulate python3-3.6.5-lp151.5.1 [ 9s] [168/179] cumulate libosmo-sigtran7-1.5.0-lp151.1.1 [ 9s] [169/179] cumulate shadow-4.6-lp151.1.27 [ 9s] [170/179] cumulate sysuser-shadow-2.0-lp151.3.70 [ 9s] [171/179] cumulate libosmo-sigtran-devel-1.5.0-lp151.1.1 [ 9s] [172/179] cumulate system-group-hardware-20170617-lp151.4.70 [ 9s] [173/179] cumulate libutempter0-1.1.6-lp151.4.70 [ 9s] [174/179] cumulate util[ 3.287775] serial8250: too much work for irq4 [ 9s] -linux-2.33.1-lp151.2.23 [ 9s] [175/179] cumulate aaa_base-84.87+git20180409.04c9dae-lp151.4.1 [ 9s] [176/179] cumulate systemd-234-lp151.25.7 [ 9s] [177/179] cumulate rpm-build-4.14.1-lp151.13.10 [ 9s] [178/179] cumulate aaa_base-malloccheck-84.87+git20180409.04c9dae-lp151.4.1 [ 9s] [179/179] cumulate post-build-checks-84.88+git20181015.ceb5c96-lp151.1.1 [ 9s] now installing cumulated packages [ 9s] Preparing... ######################################## [ 9s] file /usr/lib64/libsystemd.so.0.19.0 conflicts between attempted installs of libsystemd0-234-lp151.25.7.x86_64 and libsystemd0-mini-234-lp151.25.1.x86_64 [ 9s] exit ... [ 9s] ### VM INTERACTION START ### [ 12s] [ 6.519837] sysrq: SysRq : Power Off [ 12s] [ 6.524127] reboot: Power down [ 12s] ### VM INTERACTION END ### [ 12s] [ 12s] goat11 failed "build osmo-iuh.spec" at Thu Jan 6 00:58:59 UTC 2022. [ 12s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

3 years, 5 months

1
0
0 0

Build failure of network:osmocom:latest/osmo-iuh in openSUSE_Leap_15.2/x86_64

by OBS Notification

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/os… Package network:osmocom:latest/osmo-iuh failed to build in openSUSE_Leap_15.2/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-iuh Last lines of build log: [ 13s] [163/180] cumulate python3-base-3.6.10-lp152.3.7 [ 13s] [164/180] cumulate gcc-PIE-7-lp152.4.114 [ 13s] [165/180] cumulate libosmonetif-devel-1.1.0-lp152.2.2 [ 13s] [166/180] cumulate libosmoctrl-devel-1.6.0-lp152.1.1 [ 13s] [167/180] cumulate libosmogb-devel-1.6.0-lp152.1.1 [ 13s] [168/180] cumulate python3-3.6.10-lp152.3.44 [ 13s] [169/180] cumulate libosmo-sigtran7-1.5.0-lp152.1.1 [ 13s] [170/180] cumulate shadow-4.6-lp152.3.80 [ 13s] [171/180] cumulate sysuser-shadow-2.0-lp152.4.114 [ 13s] [172/180] cumulate libosmo-sigtran-devel-1.5.0-lp152.1.1 [ 13s] [173/180] cumulate system-group-hardware-20170617-lp152.5.114 [ 13s] [174/180] cumulate libutempter0-1.1.6-lp152.5.114 [ 13s] [175/180] cumulate util-linux-2.33.1-lp152.4.78 [ 13s] [176/180] cumulate aaa_base-84.87+git20180409.04c9dae-lp152.13.1 [ 13s] [177/180] cumulate systemd-234-lp152.30.1 [ 13s] [178/180] cumulate rpm-build-4.14.1-lp152.17.5 [ 13s] [179/180] cumulate aaa_base-malloccheck-84.87+git20180409.04c9dae-lp152.13.1 [ 13s] [180/180] cumulate post-build-checks-84.87+git20200110.2d02f07-lp152.1.1 [ 13s] now installing cumulated packages [ 13s] Preparing... ######################################## [ 13s] file /usr/lib64/libsystemd.so.0.19.0 conflicts between attempted installs of libsystemd0-234-lp152.30.1.x86_64 and libsystemd0-mini-234-lp152.30.1.x86_64 [ 13s] exit ... [ 13s] ### VM INTERACTION START ### [ 16s] [ 8.028981] sysrq: Power Off [ 16s] [ 8.048611] reboot: Power down [ 16s] ### VM INTERACTION END ### [ 16s] [ 16s] goat13 failed "build osmo-iuh.spec" at Thu Jan 6 00:59:04 UTC 2022. [ 16s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

3 years, 5 months

1
0
0 0

Change in libosmocore[master]: osmo-release.sh: Use variable containing bumpversion path everywhere

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/26777 ) Change subject: osmo-release.sh: Use variable containing bumpversion path everywhere ...................................................................... osmo-release.sh: Use variable containing bumpversion path everywhere Change-Id: I76d4f687a245468a37eb39df034ed36df2274350 --- M osmo-release.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/77/26777/1 diff --git a/osmo-release.sh b/osmo-release.sh index 3566ef9..5f31c5f 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -279,7 +279,7 @@ --new-version="$NEW_VER_WITH_EPOCH" dch -r -m --distribution "unstable" "" git add ${GIT_TOPDIR}/debian/changelog -bumpversion --current-version $VERSION $REL --tag --commit --tag-name $NEW_VER --allow-dirty +$BUMPVER --current-version $VERSION $REL --tag --commit --tag-name $NEW_VER --allow-dirty git commit --amend # let the user add extra information to the release commit. git tag -s $NEW_VER -f -m "Release v$NEW_VER on $ISODATE." echo "Release $NEW_VER prepared, tagged and signed." -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26777 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I76d4f687a245468a37eb39df034ed36df2274350 Gerrit-Change-Number: 26777 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 5 months

2
3
0 0

Change in libosmocore[master]: iuup: Fix decoding of 1byte-length subflow size fields

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/26786 ) Change subject: iuup: Fix decoding of 1byte-length subflow size fields ...................................................................... iuup: Fix decoding of 1byte-length subflow size fields Change-Id: I78ae9e7d46d0725ddec05e004ae22ee5da738162 --- M src/gsm/iuup.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/86/26786/1 diff --git a/src/gsm/iuup.c b/src/gsm/iuup.c index b838dc6..f526382 100644 --- a/src/gsm/iuup.c +++ b/src/gsm/iuup.c @@ -527,7 +527,7 @@ } else { uint8_t *subflow_size = ihdr_rfci->subflow_length; for (i = 0; i < ihdr->num_subflows_per_rfci; i++) { - iui->config.subflow_sizes[ihdr_rfci->rfci][i] = osmo_load16be(subflow_size); + iui->config.subflow_sizes[ihdr_rfci->rfci][i] = *subflow_size; subflow_size++; } } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26786 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I78ae9e7d46d0725ddec05e004ae22ee5da738162 Gerrit-Change-Number: 26786 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 5 months

2
2
0 0

Change in libosmocore[master]: src/conv.c: Align better with Osmocom coding style

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/26789 ) Change subject: src/conv.c: Align better with Osmocom coding style ...................................................................... src/conv.c: Align better with Osmocom coding style Change-Id: Ie37ed571b4ca0d133d3d18812bf664572fd77916 --- M src/conv.c 1 file changed, 47 insertions(+), 57 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/89/26789/1 diff --git a/src/conv.c b/src/conv.c index 4696a44..4907845 100644 --- a/src/conv.c +++ b/src/conv.c @@ -63,7 +63,7 @@ /* Count punctured bits */ if (code->puncture) { - for (pbits=0; code->puncture[pbits] >= 0; pbits++); + for (pbits = 0; code->puncture[pbits] >= 0; pbits++) ; out_len -= pbits; } @@ -81,7 +81,7 @@ */ void osmo_conv_encode_init(struct osmo_conv_encoder *encoder, - const struct osmo_conv_code *code) + const struct osmo_conv_code *code) { memset(encoder, 0x00, sizeof(struct osmo_conv_encoder)); OSMO_ASSERT(code != NULL); @@ -90,12 +90,12 @@ void osmo_conv_encode_load_state(struct osmo_conv_encoder *encoder, - const ubit_t *input) + const ubit_t * input) { int i; uint8_t state = 0; - for (i=0; i<(encoder->code->K-1); i++) + for (i = 0; i < (encoder->code->K - 1); i++) state = (state << 1) | input[i]; encoder->state = state; @@ -103,15 +103,14 @@ static inline int _conv_encode_do_output(struct osmo_conv_encoder *encoder, - uint8_t out, ubit_t *output) + uint8_t out, ubit_t * output) { const struct osmo_conv_code *code = encoder->code; int o_idx = 0; int j; if (code->puncture) { - for (j=0; j<code->N; j++) - { + for (j = 0; j < code->N; j++) { int bit_no = code->N - j - 1; int r_idx = encoder->i_idx * code->N + j; @@ -121,8 +120,7 @@ output[o_idx++] = (out >> bit_no) & 1; } } else { - for (j=0; j<code->N; j++) - { + for (j = 0; j < code->N; j++) { int bit_no = code->N - j - 1; output[o_idx++] = (out >> bit_no) & 1; } @@ -133,7 +131,7 @@ int osmo_conv_encode_raw(struct osmo_conv_encoder *encoder, - const ubit_t *input, ubit_t *output, int n) + const ubit_t * input, ubit_t * output, int n) { const struct osmo_conv_code *code = encoder->code; uint8_t state; @@ -143,11 +141,11 @@ o_idx = 0; state = encoder->state; - for (i=0; i<n; i++) { + for (i = 0; i < n; i++) { int bit = input[i]; uint8_t out; - out = code->next_output[state][bit]; + out = code->next_output[state][bit]; state = code->next_state[state][bit]; o_idx += _conv_encode_do_output(encoder, out, &output[o_idx]); @@ -175,14 +173,14 @@ o_idx = 0; state = encoder->state; - for (i=0; i<n; i++) { + for (i = 0; i < n; i++) { uint8_t out; if (code->next_term_output) { - out = code->next_term_output[state]; + out = code->next_term_output[state]; state = code->next_term_state[state]; } else { - out = code->next_output[state][0]; + out = code->next_output[state][0]; state = code->next_state[state][0]; } @@ -208,7 +206,7 @@ */ int osmo_conv_encode(const struct osmo_conv_code *code, - const ubit_t *input, ubit_t *output) + const ubit_t * input, ubit_t * output) { struct osmo_conv_encoder encoder; int l; @@ -238,17 +236,18 @@ /* Forward declaration for accerlated decoding with certain codes */ int osmo_conv_decode_acc(const struct osmo_conv_code *code, - const sbit_t *input, ubit_t *output); + const sbit_t * input, ubit_t * output); void osmo_conv_decode_init(struct osmo_conv_decoder *decoder, - const struct osmo_conv_code *code, int len, int start_state) + const struct osmo_conv_code *code, int len, + int start_state) { int n_states; /* Init */ if (len <= 0) - len = code->len; + len = code->len; n_states = 1 << (code->K - 1); @@ -259,7 +258,7 @@ decoder->len = len; /* Allocate arrays */ - decoder->ae = malloc(sizeof(unsigned int) * n_states); + decoder->ae = malloc(sizeof(unsigned int) * n_states); decoder->ae_next = malloc(sizeof(unsigned int) * n_states); decoder->state_history = malloc(sizeof(uint8_t) * n_states * (len + decoder->code->K - 1)); @@ -283,7 +282,7 @@ memset(decoder->ae, 0x00, sizeof(unsigned int) * decoder->n_states); } else { /* Fixed start state */ - for (i=0; i<decoder->n_states; i++) { + for (i = 0; i < decoder->n_states; i++) { decoder->ae[i] = (i == start_state) ? 0 : MAX_AE; } } @@ -300,12 +299,12 @@ decoder->p_idx = 0; /* Initial error normalize (remove constant) */ - for (i=0; i<decoder->n_states; i++) { + for (i = 0; i < decoder->n_states; i++) { if (decoder->ae[i] < min_ae) min_ae = decoder->ae[i]; } - for (i=0; i<decoder->n_states; i++) + for (i = 0; i < decoder->n_states; i++) decoder->ae[i] -= min_ae; } @@ -321,7 +320,7 @@ int osmo_conv_decode_scan(struct osmo_conv_decoder *decoder, - const sbit_t *input, int n) + const sbit_t * input, int n) { const struct osmo_conv_code *code = decoder->code; @@ -338,27 +337,25 @@ /* Prepare */ n_states = decoder->n_states; - ae = decoder->ae; + ae = decoder->ae; ae_next = decoder->ae_next; state_history = &decoder->state_history[n_states * decoder->o_idx]; - in_sym = alloca(sizeof(sbit_t) * code->N); + in_sym = alloca(sizeof(sbit_t) * code->N); i_idx = 0; p_idx = decoder->p_idx; /* Scan the treillis */ - for (i=0; i<n; i++) - { + for (i = 0; i < n; i++) { /* Reset next accumulated error */ - for (s=0; s<n_states; s++) { + for (s = 0; s < n_states; s++) ae_next[s] = MAX_AE; - } /* Get input */ if (code->puncture) { /* Hard way ... */ - for (j=0; j<code->N; j++) { + for (j = 0; j < code->N; j++) { int idx = ((decoder->o_idx + i) * code->N) + j; if (idx == code->puncture[p_idx]) { in_sym[j] = 0; /* Undefined */ @@ -375,23 +372,21 @@ } /* Scan all state */ - for (s=0; s<n_states; s++) - { + for (s = 0; s < n_states; s++) { /* Scan possible input bits */ - for (b=0; b<2; b++) - { + for (b = 0; b < 2; b++) { int nae, ov, e; uint8_t m; /* Next output and state */ - uint8_t out = code->next_output[s][b]; + uint8_t out = code->next_output[s][b]; uint8_t state = code->next_state[s][b]; /* New error for this path */ nae = ae[s]; /* start from last error */ m = 1 << (code->N - 1); /* mask for 'out' bit selection */ - for (j=0; j<code->N; j++) { + for (j = 0; j < code->N; j++) { int is = (int)in_sym[j]; if (is) { ov = (out & m) ? -127 : 127; /* sbit_t value for it */ @@ -439,27 +434,25 @@ /* Prepare */ n_states = decoder->n_states; - ae = decoder->ae; + ae = decoder->ae; ae_next = decoder->ae_next; state_history = &decoder->state_history[n_states * decoder->o_idx]; - in_sym = alloca(sizeof(sbit_t) * code->N); + in_sym = alloca(sizeof(sbit_t) * code->N); i_idx = 0; p_idx = decoder->p_idx; /* Scan the treillis */ - for (i=0; i<code->K-1; i++) - { + for (i = 0; i < code->K - 1; i++) { /* Reset next accumulated error */ - for (s=0; s<n_states; s++) { + for (s = 0; s < n_states; s++) ae_next[s] = MAX_AE; - } /* Get input */ if (code->puncture) { /* Hard way ... */ - for (j=0; j<code->N; j++) { + for (j = 0; j < code->N; j++) { int idx = ((decoder->o_idx + i) * code->N) + j; if (idx == code->puncture[p_idx]) { in_sym[j] = 0; /* Undefined */ @@ -476,8 +469,7 @@ } /* Scan all state */ - for (s=0; s<n_states; s++) - { + for (s = 0; s < n_states; s++) { int nae, ov, e; uint8_t m; @@ -486,10 +478,10 @@ uint8_t state; if (code->next_term_output) { - out = code->next_term_output[s]; + out = code->next_term_output[s]; state = code->next_term_state[s]; } else { - out = code->next_output[s][0]; + out = code->next_output[s][0]; state = code->next_state[s][0]; } @@ -497,7 +489,7 @@ nae = ae[s]; /* start from last error */ m = 1 << (code->N - 1); /* mask for 'out' bit selection */ - for (j=0; j<code->N; j++) { + for (j = 0; j < code->N; j++) { int is = (int)in_sym[j]; if (is) { ov = (out & m) ? -127 : 127; /* sbit_t value for it */ @@ -547,14 +539,13 @@ int t, n, i; uint8_t *sh_ptr; - for (s=0; s<decoder->n_states; s++) - { + for (s = 0; s < decoder->n_states; s++) { /* Check if that state traces back to itself */ n = decoder->o_idx; sh_ptr = &decoder->state_history[decoder->n_states * (n-1)]; t = s; - for (i=n-1; i>=0; i--) { + for (i = n - 1; i >= 0; i--) { t = sh_ptr[t]; sh_ptr -= decoder->n_states; } @@ -616,16 +607,15 @@ /* No output for the K-1 termination input bits */ if (has_flush) { - for (i=0; i<code->K-1; i++) { + for (i = 0; i < code->K - 1; i++) { cur_state = sh_ptr[cur_state]; sh_ptr -= decoder->n_states; } n -= code->K - 1; } - /* Generate output backward */ - for (i=n-1; i>=0; i--) - { + /* Generate output backward */ + for (i = n - 1; i >= 0; i--) { min_state = cur_state; cur_state = sh_ptr[cur_state]; @@ -652,7 +642,7 @@ */ int osmo_conv_decode(const struct osmo_conv_code *code, - const sbit_t *input, ubit_t *output) + const sbit_t * input, ubit_t * output) { struct osmo_conv_decoder decoder; int rv, l; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26789 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie37ed571b4ca0d133d3d18812bf664572fd77916 Gerrit-Change-Number: 26789 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 5 months

1
3
0 0

Change in libosmocore[master]: stats_tcp: use a default batch size of 5 instead of 1

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/26766 ) Change subject: stats_tcp: use a default batch size of 5 instead of 1 ...................................................................... stats_tcp: use a default batch size of 5 instead of 1 The configuration defaults for the socket statistics are currently set to a batch size of 1. This means that only one socket per timer expiration is scanned. This rate is probably a bit low. To speed things up a bit we should set the default to 5. Scanning 5 sockets at a time is still in the affordable range. Change-Id: I87abc74c00377191f7940c5b8f19d932618fc019 Related: SYS#5701 --- M include/osmocom/core/stats_tcp.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/66/26766/1 diff --git a/include/osmocom/core/stats_tcp.h b/include/osmocom/core/stats_tcp.h index 6b9657a..9bc7111 100644 --- a/include/osmocom/core/stats_tcp.h +++ b/include/osmocom/core/stats_tcp.h @@ -1,7 +1,7 @@ #pragma once #define TCP_STATS_DEFAULT_INTERVAL 0 /* secs */ -#define TCP_STATS_DEFAULT_BATCH_SIZE 1 /* sockets per interval */ +#define TCP_STATS_DEFAULT_BATCH_SIZE 5 /* sockets per interval */ struct osmo_tcp_stats_config { /* poll interval in seconds, use osmo_stats_tcp_set_interval() to manipulate this value */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I87abc74c00377191f7940c5b8f19d932618fc019 Gerrit-Change-Number: 26766 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 5 months

2
2
0 0

Change in libosmocore[master]: conv: Fix the traceback for tail biting codes

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/26657 ) Change subject: conv: Fix the traceback for tail biting codes ...................................................................... conv: Fix the traceback for tail biting codes When picking the end state, looking only at the path metric is highly suboptimal because in a tail biting code, we _know_ that whatever treillis path is correct, it must start and end at the same state. So we only consider path meeting that condition. We know any path that doesn't isn't the right one. We only fallback to only path metric if no path met that condition. Fixes OS#4508 Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I87e51d3880c0fe7bf3d6cd08fd46517a424a230c --- M include/osmocom/core/conv.h M src/conv.c M src/conv_acc.c 3 files changed, 89 insertions(+), 22 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/include/osmocom/core/conv.h b/include/osmocom/core/conv.h index 1c14c3b..84ef0f8 100644 --- a/include/osmocom/core/conv.h +++ b/include/osmocom/core/conv.h @@ -124,6 +124,7 @@ const sbit_t *input, int n); int osmo_conv_decode_flush(struct osmo_conv_decoder *decoder, const sbit_t *input); +int osmo_conv_decode_get_best_end_state(struct osmo_conv_decoder *decoder); int osmo_conv_decode_get_output(struct osmo_conv_decoder *decoder, ubit_t *output, int has_flush, int end_state); diff --git a/src/conv.c b/src/conv.c index 0e07e1f..4696a44 100644 --- a/src/conv.c +++ b/src/conv.c @@ -526,38 +526,87 @@ } int -osmo_conv_decode_get_output(struct osmo_conv_decoder *decoder, - ubit_t *output, int has_flush, int end_state) +osmo_conv_decode_get_best_end_state(struct osmo_conv_decoder *decoder) { const struct osmo_conv_code *code = decoder->code; - int min_ae; - uint8_t min_state, cur_state; - int i, s, n; + int min_ae, min_state; + int s; - uint8_t *sh_ptr; + /* If flushed, we _know_ the end state */ + if (code->term == CONV_TERM_FLUSH) + return 0; - /* End state ? */ - if (end_state < 0) { - /* Find state with least error */ - min_ae = MAX_AE; - min_state = 0xff; + /* Search init */ + min_state = -1; + min_ae = MAX_AE; + + /* If tail biting, we search for the minimum path metric that + * gives a circular traceback (i.e. start_state == end_state */ + if (code->term == CONV_TERM_TAIL_BITING) { + int t, n, i; + uint8_t *sh_ptr; for (s=0; s<decoder->n_states; s++) { + /* Check if that state traces back to itself */ + n = decoder->o_idx; + sh_ptr = &decoder->state_history[decoder->n_states * (n-1)]; + t = s; + + for (i=n-1; i>=0; i--) { + t = sh_ptr[t]; + sh_ptr -= decoder->n_states; + } + + if (s != t) + continue; + + /* If it does, consider it */ if (decoder->ae[s] < min_ae) { min_ae = decoder->ae[s]; min_state = s; } } - if (min_state == 0xff) - return -1; - } else { - min_state = (uint8_t) end_state; - min_ae = decoder->ae[end_state]; + if (min_ae < MAX_AE) + return min_state; } + /* Finally, just the lowest path metric */ + for (s = 0; s < decoder->n_states; s++) { + /* Is it smaller ? */ + if (decoder->ae[s] < min_ae) { + min_ae = decoder->ae[s]; + min_state = s; + } + } + + return min_state; +} + +int +osmo_conv_decode_get_output(struct osmo_conv_decoder *decoder, + ubit_t *output, int has_flush, int end_state) +{ + const struct osmo_conv_code *code = decoder->code; + + int min_ae; + uint8_t min_state, cur_state; + int i, n; + + uint8_t *sh_ptr; + + /* End state ? */ + if (end_state < 0) + end_state = osmo_conv_decode_get_best_end_state(decoder); + + if (end_state < 0) + return -1; + + min_state = (uint8_t) end_state; + min_ae = decoder->ae[end_state]; + /* Traceback */ cur_state = min_state; @@ -598,8 +647,8 @@ * * This is an all-in-one function, taking care of * \ref osmo_conv_decode_init, \ref osmo_conv_decode_scan, - * \ref osmo_conv_decode_flush, \ref osmo_conv_decode_get_output and - * \ref osmo_conv_decode_deinit. + * \ref osmo_conv_decode_flush, \ref osmo_conv_decode_get_best_end_state, + * \ref osmo_conv_decode_get_output and \ref osmo_conv_decode_deinit. */ int osmo_conv_decode(const struct osmo_conv_code *code, @@ -626,7 +675,7 @@ rv = osmo_conv_decode_get_output(&decoder, output, code->term == CONV_TERM_FLUSH, /* has_flush */ - code->term == CONV_TERM_FLUSH ? 0 : -1 /* end_state */ + -1 /* end_state */ ); osmo_conv_decode_deinit(&decoder); diff --git a/src/conv_acc.c b/src/conv_acc.c index a26ed3b..4bd3b07 100644 --- a/src/conv_acc.c +++ b/src/conv_acc.c @@ -483,10 +483,27 @@ */ static int traceback(struct vdecoder *dec, uint8_t *out, int term, int len) { - int i, sum, max = -1; - unsigned path, state = 0; + int i, j, sum, max = -1; + unsigned path, state = 0, state_scan; - if (term != CONV_TERM_FLUSH) { + if (term == CONV_TERM_TAIL_BITING) { + for (i = 0; i < dec->trellis.num_states; i++) { + state_scan = i; + for (j = len - 1; j >= 0; j--) { + path = dec->paths[j][state_scan] + 1; + state_scan = vstate_lshift(state_scan, dec->k, path); + } + if (state_scan != i) + continue; + sum = dec->trellis.sums[i]; + if (sum > max) { + max = sum; + state = i; + } + } + } + + if ((max < 0) && (term != CONV_TERM_FLUSH)) { for (i = 0; i < dec->trellis.num_states; i++) { sum = dec->trellis.sums[i]; if (sum > max) { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26657 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I87e51d3880c0fe7bf3d6cd08fd46517a424a230c Gerrit-Change-Number: 26657 Gerrit-PatchSet: 4 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 5 months

1
0
0 0

Change in libosmocore[master]: conv: Fix the traceback for tail biting codes

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/26657 ) Change subject: conv: Fix the traceback for tail biting codes ...................................................................... Patch Set 3: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26657 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I87e51d3880c0fe7bf3d6cd08fd46517a424a230c Gerrit-Change-Number: 26657 Gerrit-PatchSet: 3 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 05 Jan 2022 20:15:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in libosmocore[master]: conv: Fix the traceback for tail biting codes

by laforge

laforge has removed a vote from this change. ( https://gerrit.osmocom.org/c/libosmocore/+/26657 ) Change subject: conv: Fix the traceback for tail biting codes ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26657 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I87e51d3880c0fe7bf3d6cd08fd46517a424a230c Gerrit-Change-Number: 26657 Gerrit-PatchSet: 3 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: deleteVote

3 years, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log January 2022