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

Change in osmo-bts[master]: osmo-bts-trx: tx_tchh_fn(): make handling of FACCH/H cleaner

by fixeria

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/27835 to look at the new patch set (#2). Change subject: osmo-bts-trx: tx_tchh_fn(): make handling of FACCH/H cleaner ...................................................................... osmo-bts-trx: tx_tchh_fn(): make handling of FACCH/H cleaner If set, chan_state->dl_ongoing_facch indicates that we're sending the 2 (out of 6) middle bursts of FACCH/H. In this case there is no room for encoding an additional frame, because both even and odd numbered bits are occupied by a previously encoded FACCH/H. Right after calling tch_dl_dequeue(): * do not check the dequeued message against NULL, * do not compare the message length to GSM_MACBLOCK_LEN, * immediately free() it and jump to the sending part. Change-Id: Ib923b8f5cc1063e9fc18acd2bdd003fd09f4b70f Related: SYS#5919, OS#4823 --- M src/osmo-bts-trx/sched_lchan_tchh.c 1 file changed, 9 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/35/27835/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27835 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib923b8f5cc1063e9fc18acd2bdd003fd09f4b70f Gerrit-Change-Number: 27835 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: check if scheduling of [dummy] FACCH/H is allowed

by fixeria

Attention is currently required from: laforge, fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/27836 to look at the new patch set (#3). Change subject: osmo-bts-trx: check if scheduling of [dummy] FACCH/H is allowed ...................................................................... osmo-bts-trx: check if scheduling of [dummy] FACCH/H is allowed Currently (without this patch) if tch_dl_dequeue() yields nothing we're scheduling dummy FACCH/H *regardless* if it's permitted to start at the given TDMA FN or not. This may result in misaligned FACCH transmission, so the MS will not able to decode anything and will report BER>0. With this patch applied we a) schedule FACCH if it's allowed to start at the current TDMA FN; b) send whatever was in the burst buffer (garbage) if FACCH/H is not permitted. This is the best we can do without introducing additional complexity. This patch does not guard against sporadic gaps in the Downlink TCH queue. However when tch_dl_dequeue() constantly yields nothing, e.g. when we end up with a codec mismatch, then this additional check saves us from starting misaligned FACCH/H transmission. If we start at a wrong TDMA offset, then all subsequent FACCH frames will be scheduled at wrong offsets and thus none of them will be decoded by the MS. Change-Id: I6f8af140a6ccf3d5fd7b98f6cb5c18e2c5e2f61b Related: SYS#5919, OS#4823 --- M src/common/scheduler.c M src/osmo-bts-trx/sched_lchan_tchh.c 2 files changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/36/27836/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6f8af140a6ccf3d5fd7b98f6cb5c18e2c5e2f61b Gerrit-Change-Number: 27836 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: use C/I in the AMR link adaptation loop

by osmith

Attention is currently required from: fixeria, pespin, dexter. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27758 ) Change subject: osmo-bts-trx: use C/I in the AMR link adaptation loop ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ide84bf864f56020c0265cfb9731615d4f7bad7f5 Gerrit-Change-Number: 27758 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Apr 2022 11:45:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: fix scheduling of dummy FACCH/H and FACCH/F

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27805 ) Change subject: osmo-bts-trx: fix scheduling of dummy FACCH/H and FACCH/F ...................................................................... Patch Set 2: (1 comment) File src/osmo-bts-trx/sched_tch.h: https://gerrit.osmocom.org/c/osmo-bts/+/27805/comment/8eee5d15_10f64ae9 PS1, Line 26: static const uint8_t tch_dummy_facch[GSM_MACBLOCK_LEN] = { > I think it's usually not a good idea defining it here without external. […] Patchset was reworked, not relevant anymore. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27805 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ief12eb67ad80de3b71f5226858dc2e0c8ae76948 Gerrit-Change-Number: 27805 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Apr 2022 11:22:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: tx_tchh_fn(): make handling of FACCH/H cleaner

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27835 ) Change subject: osmo-bts-trx: tx_tchh_fn(): make handling of FACCH/H cleaner ...................................................................... Patch Set 1: (1 comment) File src/osmo-bts-trx/sched_lchan_tchh.c: https://gerrit.osmocom.org/c/osmo-bts/+/27835/comment/bf410fac_f5c72a7b PS1, Line 395: msgb_free(msg); /* steal 2nd speech frame */ > yes please. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27835 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib923b8f5cc1063e9fc18acd2bdd003fd09f4b70f Gerrit-Change-Number: 27835 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Apr 2022 11:21:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: use C/I in the AMR link adaptation loop

by fixeria

Attention is currently required from: osmith, pespin, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27758 ) Change subject: osmo-bts-trx: use C/I in the AMR link adaptation loop ...................................................................... Patch Set 5: (2 comments) File src/osmo-bts-trx/amr_loop.c: https://gerrit.osmocom.org/c/osmo-bts/+/27758/comment/4af9315a_34669b28 PS5, Line 76: const int thresh_lower_cb = cfg->mode[chan_state->dl_cmr - 1].threshold * 5; > is the hysteresis missing here (see thresh_upper_cb)? No, as per the specs hysteresis is only used to calculate the upper threshold. See 3GPP TS 45.009, section 3.4.2, figure 2. https://gerrit.osmocom.org/c/osmo-bts/+/27758/comment/1705888e_d7989cbc PS5, Line 86: } else if (chan_state->dl_cmr < chan_state->codecs - 1) { > just to be sure, is the "else if" here intentional, instead of just "if"? given that dl_cmr is an ui […] Yes, 'else if' is wrong. Fixed in I4c0fb28813373c3d4addd28c66f5136d2c4f9ed8. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ide84bf864f56020c0265cfb9731615d4f7bad7f5 Gerrit-Change-Number: 27758 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> 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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Apr 2022 11:18:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-e1d[master]: octoi: Terminate connection on too high RIFO OVERFLOW rates

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27842 ) Change subject: octoi: Terminate connection on too high RIFO OVERFLOW rates ...................................................................... octoi: Terminate connection on too high RIFO OVERFLOW rates If we are permanently overflowing the RIFO in IP->E1 direction, the peer clock is consistently faster than our E1 clock. There's no smart way to recover from this. Log an error and disconnect. This is the opposite situation from the high RIFO UNDERFLOW situation whose logging + disconnect handling was added in Ie3fffa1c1c20962b40320c8cc088c140b8d64e77 Change-Id: Iecd294b0174c9a0572df3dad612cb4efbd9cde07 --- M src/octoi/e1oip.h M src/octoi/octoi_clnt_fsm.c M src/octoi/octoi_srv_fsm.c 3 files changed, 33 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/42/27842/1 diff --git a/src/octoi/e1oip.h b/src/octoi/e1oip.h index 54d299a..41f35cb 100644 --- a/src/octoi/e1oip.h +++ b/src/octoi/e1oip.h @@ -13,6 +13,8 @@ #define iline_stat_set(iline, idx, add) \ osmo_stat_item_set(osmo_stat_item_group_get_item((iline)->stats, idx), add) +#define FRAMES_PER_SEC_THRESHOLD 7500 + enum e1oip_line_ctr { LINE_CTR_E1oIP_UNDERRUN, LINE_CTR_E1oIP_SUBSTITUTED, diff --git a/src/octoi/octoi_clnt_fsm.c b/src/octoi/octoi_clnt_fsm.c index a3d0518..697ff77 100644 --- a/src/octoi/octoi_clnt_fsm.c +++ b/src/octoi/octoi_clnt_fsm.c @@ -279,15 +279,25 @@ } rate = iline_ctr_get_rate_1s(st->peer->iline, LINE_CTR_E1oIP_UNDERRUN); - if (rate > 7500) { - LOGPFSML(fi, LOGL_ERROR, "More than 7500 RIFO underruns per second: " - "Your clock appears to be too fast. Disconnecting.\n"); - osmo_fsm_inst_state_chg(fi, CLNT_ST_WAIT_RECONNECT, 10, 0); - osmo_fsm_inst_dispatch(fi, OCTOI_CLNT_EV_REQUEST_SERVICE, NULL); - return; + if (rate > FRAMES_PER_SEC_THRESHOLD) { + LOGPFSML(fi, LOGL_ERROR, "More than %u RIFO underruns per second: " + "Your clock appears to be too fast. Disconnecting.\n", FRAMES_PER_SEC_THRESHOLD); + goto reconnect; + } + + rate = iline_ctr_get_rate_1s(st->peer->iline, LINE_CTR_E1oIP_E1T_OVERFLOW); + if (rate > FRAMES_PER_SEC_THRESHOLD) { + LOGPFSML(fi, LOGL_ERROR, "More than %u RIFO overflows per second: " + "Your clock appears to be too slow. Disconnecting.\n", FRAMES_PER_SEC_THRESHOLD); + goto reconnect; } osmo_timer_schedule(&st->rx_alive_timer, 3, 0); + return; + +reconnect: + osmo_fsm_inst_state_chg(fi, CLNT_ST_WAIT_RECONNECT, 10, 0); + osmo_fsm_inst_dispatch(fi, OCTOI_CLNT_EV_REQUEST_SERVICE, NULL); } diff --git a/src/octoi/octoi_srv_fsm.c b/src/octoi/octoi_srv_fsm.c index 5f51003..c9fa66e 100644 --- a/src/octoi/octoi_srv_fsm.c +++ b/src/octoi/octoi_srv_fsm.c @@ -356,14 +356,24 @@ } rate = iline_ctr_get_rate_1s(st->peer->iline, LINE_CTR_E1oIP_UNDERRUN); - if (rate > 7500) { - LOGPFSML(fi, LOGL_ERROR, "More than 7500 RIFO underruns per second: " - "Peer clock is too slow. Disconnecting.\n"); - osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL); - return; + if (rate > FRAMES_PER_SEC_THRESHOLD) { + LOGPFSML(fi, LOGL_ERROR, "More than %u RIFO underruns per second: " + "Peer clock is too slow. Disconnecting.\n", FRAMES_PER_SEC_THRESHOLD); + goto term; + } + + rate = iline_ctr_get_rate_1s(st->peer->iline, LINE_CTR_E1oIP_E1T_OVERFLOW); + if (rate > FRAMES_PER_SEC_THRESHOLD) { + LOGPFSML(fi, LOGL_ERROR, "More than %u RIFO overflows per second: " + "Peer clock is too fast. Disconnecting.\n", FRAMES_PER_SEC_THRESHOLD); + goto term; } osmo_timer_schedule(&st->rx_alive_timer, 3, 0); + return; + +term: + osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL); } /* call-back function for every received OCTOI socket message for given peer */ -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Iecd294b0174c9a0572df3dad612cb4efbd9cde07 Gerrit-Change-Number: 27842 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-e1d[master]: octoi: add new counter every time a connection is accepted

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27843 ) Change subject: octoi: add new counter every time a connection is accepted ...................................................................... octoi: add new counter every time a connection is accepted This adds a new [rate] counter "e1oip:connect_accepted" that increments every time the connection is accepted for both server and client role. The rate is not really interesting, it's more the total absolute quantity that's interesting. Plotting the delta will give us spikes whenever the connection is re-established. Change-Id: I8baac768289f7e01d943f5205afa824f367a3a61 --- M src/octoi/e1oip.c M src/octoi/e1oip.h M src/octoi/octoi_clnt_fsm.c M src/octoi/octoi_srv_fsm.c 4 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/43/27843/1 diff --git a/src/octoi/e1oip.c b/src/octoi/e1oip.c index 7f15e45..cf04c9a 100644 --- a/src/octoi/e1oip.c +++ b/src/octoi/e1oip.c @@ -50,6 +50,7 @@ [LINE_CTR_E1oIP_E1O_OVERFLOW] = { "e1oip:e1o_overflow", "Frames overflowed in IP->E1 direction"}, [LINE_CTR_E1oIP_RX_OUT_OF_ORDER] = { "e1oip:rx:pkt_out_of_order", "Packets out-of-order in IP->E1 direction"}, [LINE_CTR_E1oIP_RX_OUT_OF_WIN] = { "e1oip:rx:pkt_out_of_win", "Packets out-of-rx-window in IP->E1 direction"}, + [LINE_CTR_E1oIP_CONNECT_ACCEPT] = { "e1oip:connect_accepted", "OCTOI connections entering accepted state" }, }; static const struct rate_ctr_group_desc iline_ctrg_desc = { diff --git a/src/octoi/e1oip.h b/src/octoi/e1oip.h index 41f35cb..b643b5a 100644 --- a/src/octoi/e1oip.h +++ b/src/octoi/e1oip.h @@ -22,6 +22,7 @@ LINE_CTR_E1oIP_E1O_OVERFLOW, LINE_CTR_E1oIP_RX_OUT_OF_ORDER, LINE_CTR_E1oIP_RX_OUT_OF_WIN, + LINE_CTR_E1oIP_CONNECT_ACCEPT, }; enum e1oip_line_stat { diff --git a/src/octoi/octoi_clnt_fsm.c b/src/octoi/octoi_clnt_fsm.c index 697ff77..6f42475 100644 --- a/src/octoi/octoi_clnt_fsm.c +++ b/src/octoi/octoi_clnt_fsm.c @@ -118,6 +118,7 @@ /* reset RIFO/FIFO etc. */ e1oip_line_reset(st->peer->iline); + iline_ctr_add(st->peer->iline, LINE_CTR_E1oIP_CONNECT_ACCEPT, 1); st->peer->tdm_permitted = true; osmo_timer_schedule(&st->rx_alive_timer, 3, 0); diff --git a/src/octoi/octoi_srv_fsm.c b/src/octoi/octoi_srv_fsm.c index c9fa66e..53b79e7 100644 --- a/src/octoi/octoi_srv_fsm.c +++ b/src/octoi/octoi_srv_fsm.c @@ -171,6 +171,7 @@ /* reset RIFO/FIFO etc. */ e1oip_line_reset(st->peer->iline); + iline_ctr_add(st->peer->iline, LINE_CTR_E1oIP_CONNECT_ACCEPT, 1); st->peer->tdm_permitted = true; osmo_timer_schedule(&st->rx_alive_timer, 3, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I8baac768289f7e01d943f5205afa824f367a3a61 Gerrit-Change-Number: 27843 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-e1d[master]: e1oip: Add stat items for number of timeslots

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27844 ) Change subject: e1oip: Add stat items for number of timeslots ...................................................................... e1oip: Add stat items for number of timeslots This adds "e1oip:e1t_ts_active" and "e1oip:e1o_ts_active" to show which timeslots are active (i.e. which are transmitting data in the IP protocol). Change-Id: I6858e0773a348193bb4839c247294cef5ab4df5f --- M src/octoi/e1oip.c M src/octoi/e1oip.h 2 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/44/27844/1 diff --git a/src/octoi/e1oip.c b/src/octoi/e1oip.c index cf04c9a..87457db 100644 --- a/src/octoi/e1oip.c +++ b/src/octoi/e1oip.c @@ -65,6 +65,8 @@ [LINE_STAT_E1oIP_RTT] = { "e1oip:rtt", "Round Trip Time (in ms)" }, [LINE_STAT_E1oIP_E1O_FIFO] = { "e1oip:e1o_fifo_level", "E1 originated FIFO level" }, [LINE_STAT_E1oIP_E1T_FIFO] = { "e1oip:e1t_fifo_level", "E1 terminated FIFO level" }, + [LINE_STAT_E1oIP_E1O_TS] = { "e1oip:e1o_ts_active", "E1 timeslots active in E1->IP direction" }, + [LINE_STAT_E1oIP_E1T_TS] = { "e1oip:e1t_ts_active", "E1 timeslots active in IP->E1 direction" }, }; static const struct osmo_stat_item_group_desc iline_stats_desc = { @@ -126,6 +128,7 @@ if (ts_mask & (1U << i)) num_ts++; } + iline_stat_set(iline, LINE_STAT_E1oIP_E1O_TS, num_ts); /* finally, encode the payload */ if (num_ts == 0) { @@ -228,6 +231,7 @@ /* compute E1oIP idx to timeslot table */ num_ts = ts_mask2idx(idx2ts, ts_mask); + iline_stat_set(iline, LINE_STAT_E1oIP_E1T_TS, num_ts); if (num_ts > 0) { n_frames = msgb_l3len(msg) / num_ts; if (msgb_l3len(msg) % num_ts) { diff --git a/src/octoi/e1oip.h b/src/octoi/e1oip.h index b643b5a..3c5a478 100644 --- a/src/octoi/e1oip.h +++ b/src/octoi/e1oip.h @@ -29,6 +29,8 @@ LINE_STAT_E1oIP_RTT, LINE_STAT_E1oIP_E1O_FIFO, LINE_STAT_E1oIP_E1T_FIFO, + LINE_STAT_E1oIP_E1O_TS, + LINE_STAT_E1oIP_E1T_TS, }; struct octoi_peer; -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27844 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I6858e0773a348193bb4839c247294cef5ab4df5f Gerrit-Change-Number: 27844 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-e1d[master]: e1oip: Rename e1oip:overflow to e1oip:e1o_overflow

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27840 ) Change subject: e1oip: Rename e1oip:overflow to e1oip:e1o_overflow ...................................................................... e1oip: Rename e1oip:overflow to e1oip:e1o_overflow This indicates that this is counting an E1-originated overflow of the OCTOI transmit FIFO, which should never happen unless your system is too slow to periodically schedule the related timers in the code. Change-Id: I0af6a2847c8356b011bcff5cc4f5d909c574ea21 --- M src/octoi/e1oip.c M src/octoi/e1oip.h M src/octoi/octoi.c 3 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/40/27840/1 diff --git a/src/octoi/e1oip.c b/src/octoi/e1oip.c index 38a22b5..b767ba7 100644 --- a/src/octoi/e1oip.c +++ b/src/octoi/e1oip.c @@ -45,8 +45,8 @@ static const struct rate_ctr_desc iline_ctr_description[] = { [LINE_CTR_E1oIP_UNDERRUN] = { "e1oip:underrun", "Frames underrun / slipped in IP->E1 direction"}, - [LINE_CTR_E1oIP_SUBSTITUTED] = { "e1oip:substituted", "Frames substituted in IP->E1 direction"}, - [LINE_CTR_E1oIP_OVERFLOW] = { "e1oip:overflow", "Frames overflowed in IP->E1 direction"}, + [LINE_CTR_E1oIP_SUBSTITUTED] = { "e1oip:substituted", "Frames substituted in E1->IP direction"}, + [LINE_CTR_E1oIP_E1O_OVERFLOW] = { "e1oip:e1o_overflow", "Frames overflowed in IP->E1 direction"}, [LINE_CTR_E1oIP_RX_OUT_OF_ORDER] = { "e1oip:rx:pkt_out_of_order", "Packets out-of-order in IP->E1 direction"}, [LINE_CTR_E1oIP_RX_OUT_OF_WIN] = { "e1oip:rx:pkt_out_of_win", "Packets out-of-rx-window in IP->E1 direction"}, }; diff --git a/src/octoi/e1oip.h b/src/octoi/e1oip.h index c992622..65ae473 100644 --- a/src/octoi/e1oip.h +++ b/src/octoi/e1oip.h @@ -16,7 +16,7 @@ enum e1oip_line_ctr { LINE_CTR_E1oIP_UNDERRUN, LINE_CTR_E1oIP_SUBSTITUTED, - LINE_CTR_E1oIP_OVERFLOW, + LINE_CTR_E1oIP_E1O_OVERFLOW, LINE_CTR_E1oIP_RX_OUT_OF_ORDER, LINE_CTR_E1oIP_RX_OUT_OF_WIN, }; diff --git a/src/octoi/octoi.c b/src/octoi/octoi.c index 5f4c2f9..8d82092 100644 --- a/src/octoi/octoi.c +++ b/src/octoi/octoi.c @@ -101,7 +101,7 @@ rc = frame_fifo_in_multi(&iline->e1o.fifo, buf, ftr); if (rc < ftr) - iline_ctr_add(iline, LINE_CTR_E1oIP_OVERFLOW, ftr - rc); + iline_ctr_add(iline, LINE_CTR_E1oIP_E1O_OVERFLOW, ftr - rc); iline_stat_set(iline, LINE_STAT_E1oIP_E1O_FIFO, frame_fifo_frames(&iline->e1o.fifo)); } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27840 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I0af6a2847c8356b011bcff5cc4f5d909c574ea21 Gerrit-Change-Number: 27840 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2022