Change in osmo-bsc[master]: NM FSMs: fix DISABLED_NOTINSTALLED -> DISABLED_NOTINSTALLED

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

laforge gerrit-no-reply at lists.osmocom.org
Sun Dec 13 12:08:45 UTC 2020


laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/21607 )

Change subject: NM FSMs: fix DISABLED_NOTINSTALLED -> DISABLED_NOTINSTALLED
......................................................................

NM FSMs: fix DISABLED_NOTINSTALLED -> DISABLED_NOTINSTALLED

This state transaction does not make sense, let's avoid it.

Change-Id: I24a78905bb684f8501dc5ade0605662ec283febc
Related: OS#4901
---
M src/osmo-bsc/nm_bb_transc_fsm.c
M src/osmo-bsc/nm_bts_fsm.c
M src/osmo-bsc/nm_bts_sm_fsm.c
M src/osmo-bsc/nm_channel_fsm.c
M src/osmo-bsc/nm_gprs_cell_fsm.c
M src/osmo-bsc/nm_gprs_nse_fsm.c
M src/osmo-bsc/nm_gprs_nsvc_fsm.c
M src/osmo-bsc/nm_rcarrier_fsm.c
8 files changed, 16 insertions(+), 9 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/osmo-bsc/nm_bb_transc_fsm.c b/src/osmo-bsc/nm_bb_transc_fsm.c
index 31e5f34..2fb52f9 100644
--- a/src/osmo-bsc/nm_bb_transc_fsm.c
+++ b/src/osmo-bsc/nm_bb_transc_fsm.c
@@ -287,7 +287,8 @@
 		bb_transc->mo.opstart_sent = false;
 		break;
 	case NM_EV_OML_DOWN:
-		nm_bb_transc_fsm_state_chg(fi, NM_BB_TRANSC_ST_OP_DISABLED_NOTINSTALLED);
+		if (fi->state != NM_BB_TRANSC_ST_OP_DISABLED_NOTINSTALLED)
+			nm_bb_transc_fsm_state_chg(fi, NM_BB_TRANSC_ST_OP_DISABLED_NOTINSTALLED);
 		break;
 	default:
 		OSMO_ASSERT(0);
diff --git a/src/osmo-bsc/nm_bts_fsm.c b/src/osmo-bsc/nm_bts_fsm.c
index c951edd..329d911 100644
--- a/src/osmo-bsc/nm_bts_fsm.c
+++ b/src/osmo-bsc/nm_bts_fsm.c
@@ -315,7 +315,8 @@
 		bts->mo.opstart_sent = false;
 		break;
 	case NM_EV_OML_DOWN:
-		nm_bts_fsm_state_chg(fi, NM_BTS_ST_OP_DISABLED_NOTINSTALLED);
+		if (fi->state != NM_BTS_ST_OP_DISABLED_NOTINSTALLED)
+			nm_bts_fsm_state_chg(fi, NM_BTS_ST_OP_DISABLED_NOTINSTALLED);
 		break;
 	default:
 		OSMO_ASSERT(0);
diff --git a/src/osmo-bsc/nm_bts_sm_fsm.c b/src/osmo-bsc/nm_bts_sm_fsm.c
index 815eea6..1bb182d 100644
--- a/src/osmo-bsc/nm_bts_sm_fsm.c
+++ b/src/osmo-bsc/nm_bts_sm_fsm.c
@@ -212,7 +212,8 @@
 		site_mgr->mo.opstart_sent = false;
 		break;
 	case NM_EV_OML_DOWN:
-		nm_bts_sm_fsm_state_chg(fi, NM_BTS_SM_ST_OP_DISABLED_NOTINSTALLED);
+		if (fi->state != NM_BTS_SM_ST_OP_DISABLED_NOTINSTALLED)
+			nm_bts_sm_fsm_state_chg(fi, NM_BTS_SM_ST_OP_DISABLED_NOTINSTALLED);
 		break;
 	default:
 		OSMO_ASSERT(0);
diff --git a/src/osmo-bsc/nm_channel_fsm.c b/src/osmo-bsc/nm_channel_fsm.c
index 620051a..31b8c03 100644
--- a/src/osmo-bsc/nm_channel_fsm.c
+++ b/src/osmo-bsc/nm_channel_fsm.c
@@ -283,7 +283,8 @@
 		ts->mo.opstart_sent = false;
 		break;
 	case NM_EV_OML_DOWN:
-		nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_NOTINSTALLED);
+		if (fi->state != NM_CHAN_ST_OP_DISABLED_NOTINSTALLED)
+			nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_NOTINSTALLED);
 		break;
 	default:
 		OSMO_ASSERT(0);
@@ -296,7 +297,6 @@
 			X(NM_EV_SW_ACT_REP) |
 			X(NM_EV_STATE_CHG_REP),
 		.out_state_mask =
-			X(NM_CHAN_ST_OP_DISABLED_NOTINSTALLED) |
 			X(NM_CHAN_ST_OP_DISABLED_DEPENDENCY) |
 			X(NM_CHAN_ST_OP_DISABLED_OFFLINE) |
 			X(NM_CHAN_ST_OP_ENABLED),
diff --git a/src/osmo-bsc/nm_gprs_cell_fsm.c b/src/osmo-bsc/nm_gprs_cell_fsm.c
index aac4ca3..4df3a3e 100644
--- a/src/osmo-bsc/nm_gprs_cell_fsm.c
+++ b/src/osmo-bsc/nm_gprs_cell_fsm.c
@@ -292,7 +292,8 @@
 				      cell->mo.force_rf_lock ? NM_STATE_LOCKED : NM_STATE_UNLOCKED);
 		break;
 	case NM_EV_OML_DOWN:
-		nm_gprs_cell_fsm_state_chg(fi, NM_GPRS_CELL_ST_OP_DISABLED_NOTINSTALLED);
+		if (fi->state != NM_GPRS_CELL_ST_OP_DISABLED_NOTINSTALLED)
+			nm_gprs_cell_fsm_state_chg(fi, NM_GPRS_CELL_ST_OP_DISABLED_NOTINSTALLED);
 		break;
 	default:
 		OSMO_ASSERT(0);
diff --git a/src/osmo-bsc/nm_gprs_nse_fsm.c b/src/osmo-bsc/nm_gprs_nse_fsm.c
index 497b43c..8a63f56 100644
--- a/src/osmo-bsc/nm_gprs_nse_fsm.c
+++ b/src/osmo-bsc/nm_gprs_nse_fsm.c
@@ -294,7 +294,8 @@
 				      nse->mo.force_rf_lock ? NM_STATE_LOCKED : NM_STATE_UNLOCKED);
 		break;
 	case NM_EV_OML_DOWN:
-		nm_gprs_nse_fsm_state_chg(fi, NM_GPRS_NSE_ST_OP_DISABLED_NOTINSTALLED);
+		if (fi->state != NM_GPRS_NSE_ST_OP_DISABLED_NOTINSTALLED)
+			nm_gprs_nse_fsm_state_chg(fi, NM_GPRS_NSE_ST_OP_DISABLED_NOTINSTALLED);
 		break;
 	default:
 		OSMO_ASSERT(0);
diff --git a/src/osmo-bsc/nm_gprs_nsvc_fsm.c b/src/osmo-bsc/nm_gprs_nsvc_fsm.c
index 2a57ada..5f0c5de 100644
--- a/src/osmo-bsc/nm_gprs_nsvc_fsm.c
+++ b/src/osmo-bsc/nm_gprs_nsvc_fsm.c
@@ -303,7 +303,8 @@
 		nsvc->mo.opstart_sent = false;
 		break;
 	case NM_EV_OML_DOWN:
-		nm_gprs_nsvc_fsm_state_chg(fi, NM_GPRS_NSVC_ST_OP_DISABLED_NOTINSTALLED);
+		if (fi->state != NM_GPRS_NSVC_ST_OP_DISABLED_NOTINSTALLED)
+			nm_gprs_nsvc_fsm_state_chg(fi, NM_GPRS_NSVC_ST_OP_DISABLED_NOTINSTALLED);
 		break;
 	default:
 		OSMO_ASSERT(0);
diff --git a/src/osmo-bsc/nm_rcarrier_fsm.c b/src/osmo-bsc/nm_rcarrier_fsm.c
index 8702ebe..4bb62fc 100644
--- a/src/osmo-bsc/nm_rcarrier_fsm.c
+++ b/src/osmo-bsc/nm_rcarrier_fsm.c
@@ -278,7 +278,8 @@
 				      trx->mo.force_rf_lock ? NM_STATE_LOCKED : NM_STATE_UNLOCKED);
 		break;
 	case NM_EV_OML_DOWN:
-		nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED);
+		if (fi->state != NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED)
+			nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED);
 		break;
 	default:
 		OSMO_ASSERT(0);

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/21607
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I24a78905bb684f8501dc5ade0605662ec283febc
Gerrit-Change-Number: 21607
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201213/1d840500/attachment.htm>


More information about the gerrit-log mailing list