Change in osmo-bsc[master]: stats: Count transitions from BORKEN state due to LCHAN_EV_TS_ERROR s...
keith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18703 ) Change subject: stats: Count transitions from BORKEN state due to LCHAN_EV_TS_ERROR signal. .. stats: Count transitions from BORKEN state due to LCHAN_EV_TS_ERROR signal. Change-Id: Ice3379020039dc3634aa3887939740729d720dee --- M include/osmocom/bsc/bts.h M src/osmo-bsc/bts.c M src/osmo-bsc/lchan_fsm.c 3 files changed, 11 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index c03c75e..d883570 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -64,6 +64,7 @@ BTS_CTR_LCHAN_BORKEN_EV_RF_CHAN_REL_ACK, BTS_CTR_LCHAN_BORKEN_EV_VTY, BTS_CTR_LCHAN_BORKEN_EV_TEARDOWN, + BTS_CTR_LCHAN_BORKEN_EV_TS_ERROR, BTS_CTR_LCHAN_BORKEN_FROM_WAIT_RR_CHAN_MODE_MODIFY_ACK, BTS_CTR_LCHAN_BORKEN_FROM_WAIT_RSL_CHAN_MODE_MODIFY_ACK, BTS_CTR_TS_BORKEN_FROM_NOT_INITIALIZED, diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index b5b7136..7abc126 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -885,6 +885,9 @@ [BTS_CTR_LCHAN_BORKEN_EV_TEARDOWN] = \ { "lchan_borken:event:teardown", "lchan in a BORKEN state is shutting down (BTS disconnected?)" }, + [BTS_CTR_LCHAN_BORKEN_EV_TS_ERROR] = \ + { "lchan_borken:event:ts_error", + "LCHAN_EV_TS_ERROR received in a BORKEN state" }, [BTS_CTR_TS_BORKEN_FROM_NOT_INITIALIZED] = \ { "ts_borken:from_state:not_initialized", "Transitions from TS NOT_INITIALIZED state to BORKEN state" }, diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 6f0fd63..ffcf2b1 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -1537,8 +1537,15 @@ switch (event) { case LCHAN_EV_TS_ERROR: + { + struct gsm_lchan *lchan = lchan_fi_lchan(fi); + if (fi->state == LCHAN_ST_BORKEN) { + rate_ctr_inc(>ts->trx->bts->bts_ctrs->ctr[BTS_CTR_LCHAN_BORKEN_EV_TS_ERROR]); + osmo_stat_item_dec(lchan->ts->trx->bts->bts_statg->items[BTS_STAT_LCHAN_BORKEN], 1); + } lchan_fail_to(LCHAN_ST_UNUSED, "LCHAN_EV_TS_ERROR"); return; + } case LCHAN_EV_RLL_ERR_IND: /* let's just ignore this. We are already logging the -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ice3379020039dc3634aa3887939740729d720dee Gerrit-Change-Number: 18703 Gerrit-PatchSet: 5 Gerrit-Owner: ipse Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-bsc[master]: stats: Count transitions from BORKEN state due to LCHAN_EV_TS_ERROR s...
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18703 ) Change subject: stats: Count transitions from BORKEN state due to LCHAN_EV_TS_ERROR signal. .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ice3379020039dc3634aa3887939740729d720dee Gerrit-Change-Number: 18703 Gerrit-PatchSet: 4 Gerrit-Owner: ipse Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 12 Apr 2021 08:40:31 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: stats: Count transitions from BORKEN state due to LCHAN_EV_TS_ERROR s...
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18703 ) Change subject: stats: Count transitions from BORKEN state due to LCHAN_EV_TS_ERROR signal. .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ice3379020039dc3634aa3887939740729d720dee Gerrit-Change-Number: 18703 Gerrit-PatchSet: 4 Gerrit-Owner: ipse Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 12 Apr 2021 08:40:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: stats: Count transitions from BORKEN state due to LCHAN_EV_TS_ERROR s...
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18703 ) Change subject: stats: Count transitions from BORKEN state due to LCHAN_EV_TS_ERROR signal. .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ice3379020039dc3634aa3887939740729d720dee Gerrit-Change-Number: 18703 Gerrit-PatchSet: 4 Gerrit-Owner: ipse Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Apr 2021 16:29:46 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: stats: Count transitions from BORKEN state due to LCHAN_EV_TS_ERROR s...
keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18703 ) Change subject: stats: Count transitions from BORKEN state due to LCHAN_EV_TS_ERROR signal. .. Patch Set 4: Sorry, I pushed to Patchset 3 from the wrong branch. Patchset 4 is Patchset 2, just rebased. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ice3379020039dc3634aa3887939740729d720dee Gerrit-Change-Number: 18703 Gerrit-PatchSet: 4 Gerrit-Owner: ipse Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 04 Apr 2021 20:10:38 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bsc[master]: stats: Count transitions from BORKEN state due to LCHAN_EV_TS_ERROR s...
keith has uploaded a new patch set (#4) to the change originally created by ipse. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18703 ) Change subject: stats: Count transitions from BORKEN state due to LCHAN_EV_TS_ERROR signal. .. stats: Count transitions from BORKEN state due to LCHAN_EV_TS_ERROR signal. Change-Id: Ice3379020039dc3634aa3887939740729d720dee --- M include/osmocom/bsc/bts.h M src/osmo-bsc/bts.c M src/osmo-bsc/lchan_fsm.c 3 files changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/03/18703/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ice3379020039dc3634aa3887939740729d720dee Gerrit-Change-Number: 18703 Gerrit-PatchSet: 4 Gerrit-Owner: ipse Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-bsc[master]: stats: Count transitions from BORKEN state due to LCHAN_EV_TS_ERROR s...
keith has uploaded a new patch set (#3) to the change originally created by ipse. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18703 ) Change subject: stats: Count transitions from BORKEN state due to LCHAN_EV_TS_ERROR signal. .. stats: Count transitions from BORKEN state due to LCHAN_EV_TS_ERROR signal. Change-Id: Ice3379020039dc3634aa3887939740729d720dee --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/lchan_fsm.c 2 files changed, 142 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/03/18703/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ice3379020039dc3634aa3887939740729d720dee Gerrit-Change-Number: 18703 Gerrit-PatchSet: 3 Gerrit-Owner: ipse Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-bsc[master]: stats: Count transitions from BORKEN state due to LCHAN_EV_TS_ERROR s...
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18703 ) Change subject: stats: Count transitions from BORKEN state due to LCHAN_EV_TS_ERROR signal. .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ice3379020039dc3634aa3887939740729d720dee Gerrit-Change-Number: 18703 Gerrit-PatchSet: 2 Gerrit-Owner: ipse Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 02 Apr 2021 11:57:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: stats: Count transitions from BORKEN state due to LCHAN_EV_TS_ERROR s...
keith has uploaded a new patch set (#2) to the change originally created by ipse. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18703 ) Change subject: stats: Count transitions from BORKEN state due to LCHAN_EV_TS_ERROR signal. .. stats: Count transitions from BORKEN state due to LCHAN_EV_TS_ERROR signal. Change-Id: Ice3379020039dc3634aa3887939740729d720dee --- M include/osmocom/bsc/bts.h M src/osmo-bsc/bts.c M src/osmo-bsc/lchan_fsm.c 3 files changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/03/18703/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ice3379020039dc3634aa3887939740729d720dee Gerrit-Change-Number: 18703 Gerrit-PatchSet: 2 Gerrit-Owner: ipse Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-bsc[master]: stats: Count transitions from BORKEN state due to LCHAN_EV_TS_ERROR s...
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18703 ) Change subject: stats: Count transitions from BORKEN state due to LCHAN_EV_TS_ERROR signal. .. Patch Set 1: somehow this was +2 but never merged? ipse, would you mind to rebase so we can get it merged? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ice3379020039dc3634aa3887939740729d720dee Gerrit-Change-Number: 18703 Gerrit-PatchSet: 1 Gerrit-Owner: ipse Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 01 Dec 2020 17:39:17 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bsc[master]: stats: Count transitions from BORKEN state due to LCHAN_EV_TS_ERROR s...
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18703 ) Change subject: stats: Count transitions from BORKEN state due to LCHAN_EV_TS_ERROR signal. .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ice3379020039dc3634aa3887939740729d720dee Gerrit-Change-Number: 18703 Gerrit-PatchSet: 1 Gerrit-Owner: ipse Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Jun 2020 08:40:29 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: stats: Count transitions from BORKEN state due to LCHAN_EV_TS_ERROR s...
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18703 ) Change subject: stats: Count transitions from BORKEN state due to LCHAN_EV_TS_ERROR signal. .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ice3379020039dc3634aa3887939740729d720dee Gerrit-Change-Number: 18703 Gerrit-PatchSet: 1 Gerrit-Owner: ipse Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 06 Jun 2020 19:39:19 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: stats: Count transitions from BORKEN state due to LCHAN_EV_TS_ERROR s...
ipse has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18703 ) Change subject: stats: Count transitions from BORKEN state due to LCHAN_EV_TS_ERROR signal. .. stats: Count transitions from BORKEN state due to LCHAN_EV_TS_ERROR signal. Change-Id: Ice3379020039dc3634aa3887939740729d720dee --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/lchan_fsm.c 2 files changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/03/18703/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index d2f6c09..e184adc 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -1416,6 +1416,7 @@ BTS_CTR_LCHAN_BORKEN_EV_RF_CHAN_REL_ACK, BTS_CTR_LCHAN_BORKEN_EV_VTY, BTS_CTR_LCHAN_BORKEN_EV_TEARDOWN, + BTS_CTR_LCHAN_BORKEN_EV_TS_ERROR, BTS_CTR_TS_BORKEN_FROM_NOT_INITIALIZED, BTS_CTR_TS_BORKEN_FROM_UNUSED, BTS_CTR_TS_BORKEN_FROM_WAIT_PDCH_ACT, @@ -1466,6 +1467,7 @@ [BTS_CTR_LCHAN_BORKEN_EV_RF_CHAN_REL_ACK] = {"lchan_borken:event:rf_chan_rel_ack", "RF_CHAN_REL_ACK received in the lchan BORKEN state"}, [BTS_CTR_LCHAN_BORKEN_EV_VTY] = {"lchan_borken:event:vty", "VTY commands received in the lchan BORKEN state"}, [BTS_CTR_LCHAN_BORKEN_EV_TEARDOWN] = {"lchan_borken:event:teardown", "lchan in a BORKEN state is shutting down (BTS disconnected?)"}, + [BTS_CTR_LCHAN_BORKEN_EV_TS_ERROR] = {"lchan_borken:event:ts_error", "LCHAN_EV_TS_ERROR received in a BORKEN state"}, [BTS_CTR_TS_BORKEN_FROM_NOT_INITIALIZED] = {"ts_borken:from_state:not_initialized", "Transitions from TS NOT_INITIALIZED state to BORKEN state"}, [BTS_CTR_TS_BORKEN_FROM_UNUSED] = {"ts_borken:from_state:unused", "Transitions from TS UNUSED state to BORKEN state"}, [BTS_CTR_TS_BORKEN_FROM_WAIT_PDCH_ACT] = {"ts_borken:from_state:wait_pdch_act", "Transitions from TS WAIT_PDCH_ACT state to BORKEN state"}, diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index a1bf857..1550ffb 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -1327,8 +1327,15 @@ switch (event) { case LCHAN_EV_TS_ERROR: + { + struct gsm_lchan *lchan = lchan_fi_lchan(fi); + if (fi->state == LCHAN_ST_BORKEN) { + rate_ctr_inc(>ts->trx->bts->bts_ctrs->ctr[BTS_CTR_LCHAN_BORKEN_EV_TS_ERROR]); + osmo_stat_item_dec(lchan->ts->trx->bts->bts_statg->items[BTS_STAT_LCHAN_BORKEN], 1); + } lchan_fail_to(LCHAN_ST_UNUSED, "LCHAN_EV_TS_ERROR"); return; + } default: return; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ice3379020039dc3634aa3887939740729d720dee Gerrit-Change-Number: 18703 Gerrit-PatchSet: 1 Gerrit-Owner: ipse Gerrit-MessageType: newchange