Change in osmo-bsc[pespin/1-8-0]: fix assignment success counters: count *before* cleanup of fsm state
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26871 ) Change subject: fix assignment success counters: count *before* cleanup of fsm state ...................................................................... fix assignment success counters: count *before* cleanup of fsm state Counting the Assignment success after osmo_fsm_inst_term() meant that we were counting a cleared out channel mode, which always yielded signalling mode. Count the Assignment success *before* terminating, so that we correctly count the successful assignment as speech mode. Related: SYS#4878 Related: Icb1386ec2ccd70eb3c026301b9b08ad7177278f7 (osmo-ttcn3-hacks) Change-Id: Ie9fcd1e86f27ecb2f11e2e8813faac365cb470b8 --- M src/osmo-bsc/assignment_fsm.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/71/26871/1 diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 656bd3e..cb3d754 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -287,10 +287,10 @@ conn->user_plane.msc_assigned_rtp_port = conn->assignment.req.msc_rtp_port; } + assignment_count_result(CTR_ASSIGNMENT_COMPLETED); + LOG_ASSIGNMENT(conn, LOGL_DEBUG, "Assignment successful\n"); osmo_fsm_inst_term(conn->assignment.fi, OSMO_FSM_TERM_REGULAR, 0); - - assignment_count_result(CTR_ASSIGNMENT_COMPLETED); } static void assignment_fsm_update_id(struct gsm_subscriber_connection *conn) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: pespin/1-8-0 Gerrit-Change-Id: Ie9fcd1e86f27ecb2f11e2e8813faac365cb470b8 Gerrit-Change-Number: 26871 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin@sysmocom.de> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> Gerrit-MessageType: newchange
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26871 ) Change subject: fix assignment success counters: count *before* cleanup of fsm state ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: pespin/1-8-0 Gerrit-Change-Id: Ie9fcd1e86f27ecb2f11e2e8813faac365cb470b8 Gerrit-Change-Number: 26871 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin@sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> Gerrit-Reviewer: laforge <laforge@osmocom.org> Gerrit-Comment-Date: Tue, 11 Jan 2022 13:06:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26871 ) Change subject: fix assignment success counters: count *before* cleanup of fsm state ...................................................................... fix assignment success counters: count *before* cleanup of fsm state Counting the Assignment success after osmo_fsm_inst_term() meant that we were counting a cleared out channel mode, which always yielded signalling mode. Count the Assignment success *before* terminating, so that we correctly count the successful assignment as speech mode. Related: SYS#4878 Related: Icb1386ec2ccd70eb3c026301b9b08ad7177278f7 (osmo-ttcn3-hacks) Change-Id: Ie9fcd1e86f27ecb2f11e2e8813faac365cb470b8 --- M src/osmo-bsc/assignment_fsm.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 656bd3e..cb3d754 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -287,10 +287,10 @@ conn->user_plane.msc_assigned_rtp_port = conn->assignment.req.msc_rtp_port; } + assignment_count_result(CTR_ASSIGNMENT_COMPLETED); + LOG_ASSIGNMENT(conn, LOGL_DEBUG, "Assignment successful\n"); osmo_fsm_inst_term(conn->assignment.fi, OSMO_FSM_TERM_REGULAR, 0); - - assignment_count_result(CTR_ASSIGNMENT_COMPLETED); } static void assignment_fsm_update_id(struct gsm_subscriber_connection *conn) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: pespin/1-8-0 Gerrit-Change-Id: Ie9fcd1e86f27ecb2f11e2e8813faac365cb470b8 Gerrit-Change-Number: 26871 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin@sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> Gerrit-Reviewer: laforge <laforge@osmocom.org> Gerrit-Reviewer: pespin <pespin@sysmocom.de> Gerrit-MessageType: merged
participants (2)
-
laforge -
pespin