<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/25490">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">nm_*_fsm: Set adminsitrative state 'shutting down' when shutdown procedure starts<br><br>Change-Id: I0d14840a55642812b865687a6cb208e7ffd22829<br>---<br>M include/osmo-bts/nm_common_fsm.h<br>M src/common/bts_shutdown_fsm.c<br>M src/common/nm_bb_transc_fsm.c<br>M src/common/nm_bts_fsm.c<br>M src/common/nm_bts_sm_fsm.c<br>M src/common/nm_channel_fsm.c<br>M src/common/nm_common_fsm.c<br>M src/common/nm_radio_carrier_fsm.c<br>8 files changed, 105 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/nm_common_fsm.h b/include/osmo-bts/nm_common_fsm.h</span><br><span>index 4679b23..4dab0ea 100644</span><br><span>--- a/include/osmo-bts/nm_common_fsm.h</span><br><span>+++ b/include/osmo-bts/nm_common_fsm.h</span><br><span>@@ -31,6 +31,7 @@</span><br><span> NM_EV_SW_ACT,</span><br><span> NM_EV_OPSTART_ACK,</span><br><span> NM_EV_OPSTART_NACK,</span><br><span style="color: hsl(120, 100%, 40%);">+ NM_EV_SHUTDOWN_START,</span><br><span> NM_EV_RSL_UP, /* RadioCarrier and BaseBand Transceiver only */</span><br><span> NM_EV_RSL_DOWN, /* RadioCarrier and BaseBand Transceiver only */</span><br><span> NM_EV_PHYLINK_UP, /* RadioCarrier and BaseBand Transceiver only */</span><br><span>diff --git a/src/common/bts_shutdown_fsm.c b/src/common/bts_shutdown_fsm.c</span><br><span>index 0ac3078..cffe7cd 100644</span><br><span>--- a/src/common/bts_shutdown_fsm.c</span><br><span>+++ b/src/common/bts_shutdown_fsm.c</span><br><span>@@ -29,6 +29,7 @@</span><br><span> #include <osmo-bts/gsm_data.h></span><br><span> #include <osmo-bts/bts_model.h></span><br><span> #include <osmo-bts/bts.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmo-bts/nm_common_fsm.h></span><br><span> </span><br><span> #define X(s) (1 << (s))</span><br><span> </span><br><span>@@ -58,6 +59,9 @@</span><br><span> unsigned int count;</span><br><span> switch(event) {</span><br><span> case BTS_SHUTDOWN_EV_START:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Firt announce to NM objects that we are starting a shutdown procedure: */</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(bts->site_mgr.mo.fi, NM_EV_SHUTDOWN_START, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> count = count_trx_operational(bts);</span><br><span> if (count) {</span><br><span> bts_shutdown_fsm_state_chg(fi, BTS_SHUTDOWN_ST_WAIT_RAMP_DOWN_COMPL);</span><br><span>diff --git a/src/common/nm_bb_transc_fsm.c b/src/common/nm_bb_transc_fsm.c</span><br><span>index 75ff1aa..a909c8b 100644</span><br><span>--- a/src/common/nm_bb_transc_fsm.c</span><br><span>+++ b/src/common/nm_bb_transc_fsm.c</span><br><span>@@ -181,6 +181,28 @@</span><br><span> nm_bb_transc_fsm_state_chg(fi, NM_BBTRANSC_ST_OP_DISABLED_OFFLINE);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void nm_bb_transc_allstate(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_bb_trx *bb_transc = (struct gsm_bts_bb_trx *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx *trx = gsm_bts_bb_trx_get_trx(bb_transc);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t tn;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (event) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_EV_SHUTDOWN_START:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Announce we start shutting down */</span><br><span style="color: hsl(120, 100%, 40%);">+ oml_mo_state_chg(&bb_transc->mo, -1, -1, NM_STATE_SHUTDOWN);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Propagate event to children: */</span><br><span style="color: hsl(120, 100%, 40%);">+ for (tn = 0; tn < TRX_NR_TS; tn++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx_ts *ts = &trx->ts[tn];</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(ts->mo.fi, NM_EV_SHUTDOWN_START, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(false);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static struct osmo_fsm_state nm_bb_transc_fsm_states[] = {</span><br><span> [NM_BBTRANSC_ST_OP_DISABLED_NOTINSTALLED] = {</span><br><span> .in_event_mask =</span><br><span>@@ -229,6 +251,8 @@</span><br><span> .states = nm_bb_transc_fsm_states,</span><br><span> .num_states = ARRAY_SIZE(nm_bb_transc_fsm_states),</span><br><span> .event_names = nm_fsm_event_names,</span><br><span style="color: hsl(120, 100%, 40%);">+ .allstate_action = nm_bb_transc_allstate,</span><br><span style="color: hsl(120, 100%, 40%);">+ .allstate_event_mask = X(NM_EV_SHUTDOWN_START),</span><br><span> .log_subsys = DOML,</span><br><span> };</span><br><span> </span><br><span>diff --git a/src/common/nm_bts_fsm.c b/src/common/nm_bts_fsm.c</span><br><span>index 6575b54..93e5740 100644</span><br><span>--- a/src/common/nm_bts_fsm.c</span><br><span>+++ b/src/common/nm_bts_fsm.c</span><br><span>@@ -102,6 +102,27 @@</span><br><span> {</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void nm_bts_allstate(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = (struct gsm_bts *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx *trx;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (event) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_EV_SHUTDOWN_START:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Announce we start shutting down */</span><br><span style="color: hsl(120, 100%, 40%);">+ oml_mo_state_chg(&bts->mo, -1, -1, NM_STATE_SHUTDOWN);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Propagate event to children: */</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(trx, &bts->trx_list, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_SHUTDOWN_START, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_SHUTDOWN_START, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(false);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static struct osmo_fsm_state nm_bts_fsm_states[] = {</span><br><span> [NM_BTS_ST_OP_DISABLED_NOTINSTALLED] = {</span><br><span> .in_event_mask =</span><br><span>@@ -136,6 +157,8 @@</span><br><span> .states = nm_bts_fsm_states,</span><br><span> .num_states = ARRAY_SIZE(nm_bts_fsm_states),</span><br><span> .event_names = nm_fsm_event_names,</span><br><span style="color: hsl(120, 100%, 40%);">+ .allstate_action = nm_bts_allstate,</span><br><span style="color: hsl(120, 100%, 40%);">+ .allstate_event_mask = X(NM_EV_SHUTDOWN_START),</span><br><span> .log_subsys = DOML,</span><br><span> };</span><br><span> </span><br><span>diff --git a/src/common/nm_bts_sm_fsm.c b/src/common/nm_bts_sm_fsm.c</span><br><span>index 864aeab..e958917 100644</span><br><span>--- a/src/common/nm_bts_sm_fsm.c</span><br><span>+++ b/src/common/nm_bts_sm_fsm.c</span><br><span>@@ -102,6 +102,24 @@</span><br><span> {</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void nm_bts_sm_allstate(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_sm *site_mgr = (struct gsm_bts_sm *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = gsm_bts_sm_get_bts(site_mgr);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (event) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_EV_SHUTDOWN_START:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Announce we start shutting down */</span><br><span style="color: hsl(120, 100%, 40%);">+ oml_mo_state_chg(&site_mgr->mo, -1, -1, NM_STATE_SHUTDOWN);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Propagate event to children: */</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(bts->mo.fi, NM_EV_SHUTDOWN_START, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(false);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static struct osmo_fsm_state nm_bts_sm_fsm_states[] = {</span><br><span> [NM_BTS_SM_ST_OP_DISABLED_NOTINSTALLED] = {</span><br><span> .in_event_mask =</span><br><span>@@ -136,6 +154,8 @@</span><br><span> .states = nm_bts_sm_fsm_states,</span><br><span> .num_states = ARRAY_SIZE(nm_bts_sm_fsm_states),</span><br><span> .event_names = nm_fsm_event_names,</span><br><span style="color: hsl(120, 100%, 40%);">+ .allstate_action = nm_bts_sm_allstate,</span><br><span style="color: hsl(120, 100%, 40%);">+ .allstate_event_mask = X(NM_EV_SHUTDOWN_START),</span><br><span> .log_subsys = DOML,</span><br><span> };</span><br><span> </span><br><span>diff --git a/src/common/nm_channel_fsm.c b/src/common/nm_channel_fsm.c</span><br><span>index 4983c27..fc3c8a9 100644</span><br><span>--- a/src/common/nm_channel_fsm.c</span><br><span>+++ b/src/common/nm_channel_fsm.c</span><br><span>@@ -168,6 +168,20 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void nm_chan_allstate(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx_ts *ts = (struct gsm_bts_trx_ts *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (event) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_EV_SHUTDOWN_START:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Announce we start shutting down */</span><br><span style="color: hsl(120, 100%, 40%);">+ oml_mo_state_chg(&ts->mo, -1, -1, NM_STATE_SHUTDOWN);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(false);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static struct osmo_fsm_state nm_chan_fsm_states[] = {</span><br><span> [NM_CHAN_ST_OP_DISABLED_NOTINSTALLED] = {</span><br><span> .in_event_mask =</span><br><span>@@ -226,6 +240,8 @@</span><br><span> .states = nm_chan_fsm_states,</span><br><span> .num_states = ARRAY_SIZE(nm_chan_fsm_states),</span><br><span> .event_names = nm_fsm_event_names,</span><br><span style="color: hsl(120, 100%, 40%);">+ .allstate_action = nm_chan_allstate,</span><br><span style="color: hsl(120, 100%, 40%);">+ .allstate_event_mask = X(NM_EV_SHUTDOWN_START),</span><br><span> .log_subsys = DOML,</span><br><span> };</span><br><span> </span><br><span>diff --git a/src/common/nm_common_fsm.c b/src/common/nm_common_fsm.c</span><br><span>index 7273e22..3b73605 100644</span><br><span>--- a/src/common/nm_common_fsm.c</span><br><span>+++ b/src/common/nm_common_fsm.c</span><br><span>@@ -27,6 +27,7 @@</span><br><span> { NM_EV_SW_ACT, "SW_ACT" },</span><br><span> { NM_EV_OPSTART_ACK, "OPSTART_ACK" },</span><br><span> { NM_EV_OPSTART_NACK, "OPSTART_NACK" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { NM_EV_SHUTDOWN_START, "SHUTDOWN_START" },</span><br><span> { NM_EV_RSL_UP, "RSL_UP" },</span><br><span> { NM_EV_RSL_DOWN, "RSL_DOWN" },</span><br><span> { NM_EV_PHYLINK_UP, "PHYLINK_UP" },</span><br><span>diff --git a/src/common/nm_radio_carrier_fsm.c b/src/common/nm_radio_carrier_fsm.c</span><br><span>index 2bae273..40b93e3 100644</span><br><span>--- a/src/common/nm_radio_carrier_fsm.c</span><br><span>+++ b/src/common/nm_radio_carrier_fsm.c</span><br><span>@@ -171,6 +171,20 @@</span><br><span> nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_DISABLED_OFFLINE);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void nm_rcarrier_allstate(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx *trx = (struct gsm_bts_trx *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (event) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_EV_SHUTDOWN_START:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Announce we start shutting down */</span><br><span style="color: hsl(120, 100%, 40%);">+ oml_mo_state_chg(&trx->mo, -1, -1, NM_STATE_SHUTDOWN);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(false);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static struct osmo_fsm_state nm_rcarrier_fsm_states[] = {</span><br><span> [NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED] = {</span><br><span> .in_event_mask =</span><br><span>@@ -219,6 +233,8 @@</span><br><span> .states = nm_rcarrier_fsm_states,</span><br><span> .num_states = ARRAY_SIZE(nm_rcarrier_fsm_states),</span><br><span> .event_names = nm_fsm_event_names,</span><br><span style="color: hsl(120, 100%, 40%);">+ .allstate_action = nm_rcarrier_allstate,</span><br><span style="color: hsl(120, 100%, 40%);">+ .allstate_event_mask = X(NM_EV_SHUTDOWN_START),</span><br><span> .log_subsys = DOML,</span><br><span> };</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/25490">change 25490</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bts/+/25490"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I0d14840a55642812b865687a6cb208e7ffd22829 </div>
<div style="display:none"> Gerrit-Change-Number: 25490 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>