<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/25491">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">nm_*_fsm: Move to state Disabled NotInstalled Locked when shtudown proc ends<br><br>Change-Id: I5c070adbba6b4abb19467a02d6449a443657ae2b<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, 85 insertions(+), 20 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/91/25491/1</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 4dab0ea..13d7e0c 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>@@ -32,6 +32,7 @@</span><br><span> NM_EV_OPSTART_ACK,</span><br><span> NM_EV_OPSTART_NACK,</span><br><span> NM_EV_SHUTDOWN_START,</span><br><span style="color: hsl(120, 100%, 40%);">+ NM_EV_SHUTDOWN_FINISH,</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 cffe7cd..a9db76f 100644</span><br><span>--- a/src/common/bts_shutdown_fsm.c</span><br><span>+++ b/src/common/bts_shutdown_fsm.c</span><br><span>@@ -152,6 +152,10 @@</span><br><span> </span><br><span> static void st_exit_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state)</span><br><span> {</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(bts->site_mgr.mo.fi, NM_EV_SHUTDOWN_FINISH, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> LOGPFSML(fi, LOGL_NOTICE, "Shutdown process completed successfuly, exiting process\n");</span><br><span> exit(0);</span><br><span> }</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 342699c..c270f7d 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>@@ -41,6 +41,17 @@</span><br><span> #define nm_bb_transc_fsm_state_chg(fi, NEXT_STATE) \</span><br><span> osmo_fsm_inst_state_chg(fi, NEXT_STATE, 0, 0)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void ev_dispatch_children(struct gsm_bts_bb_trx *bb_transc, uint32_t event)</span><br><span style="color: hsl(120, 100%, 40%);">+{</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%);">+ 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, event, NULL);</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> //////////////////////////</span><br><span> // FSM STATE ACTIONS</span><br><span> //////////////////////////</span><br><span>@@ -184,8 +195,6 @@</span><br><span> static void nm_bb_transc_allstate(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span> {</span><br><span> struct gsm_bts_bb_trx *bb_transc = (struct gsm_bts_bb_trx *)fi->priv;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts_trx *trx = gsm_bts_bb_trx_get_trx(bb_transc);</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t tn;</span><br><span> </span><br><span> switch (event) {</span><br><span> case NM_EV_SHUTDOWN_START:</span><br><span>@@ -193,10 +202,12 @@</span><br><span> oml_mo_state_chg(&bb_transc->mo, -1, -1, NM_STATE_SHUTDOWN);</span><br><span> </span><br><span> /* Propagate event to children: */</span><br><span style="color: hsl(0, 100%, 40%);">- for (tn = 0; tn < TRX_NR_TS; tn++) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts_trx_ts *ts = &trx->ts[tn];</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(ts->mo.fi, NM_EV_SHUTDOWN_START, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ ev_dispatch_children(bb_transc, event);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_EV_SHUTDOWN_FINISH:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Propagate event to children: */</span><br><span style="color: hsl(120, 100%, 40%);">+ ev_dispatch_children(bb_transc, event);</span><br><span style="color: hsl(120, 100%, 40%);">+ nm_bb_transc_fsm_state_chg(fi, NM_BBTRANSC_ST_OP_DISABLED_NOTINSTALLED);</span><br><span> break;</span><br><span> default:</span><br><span> OSMO_ASSERT(false);</span><br><span>@@ -213,6 +224,7 @@</span><br><span> X(NM_EV_PHYLINK_DOWN) |</span><br><span> X(NM_EV_DISABLE),</span><br><span> .out_state_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_BBTRANSC_ST_OP_DISABLED_NOTINSTALLED) |</span><br><span> X(NM_BBTRANSC_ST_OP_DISABLED_OFFLINE),</span><br><span> .name = "DISABLED_NOTINSTALLED",</span><br><span> .onenter = st_op_disabled_notinstalled_on_enter,</span><br><span>@@ -228,6 +240,7 @@</span><br><span> X(NM_EV_PHYLINK_DOWN) |</span><br><span> X(NM_EV_DISABLE),</span><br><span> .out_state_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_BBTRANSC_ST_OP_DISABLED_NOTINSTALLED) |</span><br><span> X(NM_BBTRANSC_ST_OP_ENABLED),</span><br><span> .name = "DISABLED_OFFLINE",</span><br><span> .onenter = st_op_disabled_offline_on_enter,</span><br><span>@@ -239,6 +252,7 @@</span><br><span> X(NM_EV_PHYLINK_DOWN) |</span><br><span> X(NM_EV_DISABLE),</span><br><span> .out_state_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_BBTRANSC_ST_OP_DISABLED_NOTINSTALLED) |</span><br><span> X(NM_BBTRANSC_ST_OP_DISABLED_OFFLINE),</span><br><span> .name = "ENABLED",</span><br><span> .onenter = st_op_enabled_on_enter,</span><br><span>@@ -252,7 +266,8 @@</span><br><span> .num_states = ARRAY_SIZE(nm_bb_transc_fsm_states),</span><br><span> .event_names = nm_fsm_event_names,</span><br><span> .allstate_action = nm_bb_transc_allstate,</span><br><span style="color: hsl(0, 100%, 40%);">- .allstate_event_mask = X(NM_EV_SHUTDOWN_START),</span><br><span style="color: hsl(120, 100%, 40%);">+ .allstate_event_mask = X(NM_EV_SHUTDOWN_START) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_SHUTDOWN_FINISH),</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 93e5740..9210e7a 100644</span><br><span>--- a/src/common/nm_bts_fsm.c</span><br><span>+++ b/src/common/nm_bts_fsm.c</span><br><span>@@ -41,6 +41,15 @@</span><br><span> #define nm_bts_fsm_state_chg(fi, NEXT_STATE) \</span><br><span> osmo_fsm_inst_state_chg(fi, NEXT_STATE, 0, 0)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void ev_dispatch_children(struct gsm_bts *bts, uint32_t event)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx *trx;</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, event, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, event, NULL);</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> //////////////////////////</span><br><span> // FSM STATE ACTIONS</span><br><span> //////////////////////////</span><br><span>@@ -105,7 +114,6 @@</span><br><span> static void nm_bts_allstate(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span> {</span><br><span> struct gsm_bts *bts = (struct gsm_bts *)fi->priv;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts_trx *trx;</span><br><span> </span><br><span> switch (event) {</span><br><span> case NM_EV_SHUTDOWN_START:</span><br><span>@@ -113,10 +121,12 @@</span><br><span> oml_mo_state_chg(&bts->mo, -1, -1, NM_STATE_SHUTDOWN);</span><br><span> </span><br><span> /* Propagate event to children: */</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(trx, &bts->trx_list, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_SHUTDOWN_START, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_SHUTDOWN_START, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ ev_dispatch_children(bts, event);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_EV_SHUTDOWN_FINISH:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Propagate event to children: */</span><br><span style="color: hsl(120, 100%, 40%);">+ ev_dispatch_children(bts, event);</span><br><span style="color: hsl(120, 100%, 40%);">+ nm_bts_fsm_state_chg(fi, NM_BTS_ST_OP_DISABLED_NOTINSTALLED);</span><br><span> break;</span><br><span> default:</span><br><span> OSMO_ASSERT(false);</span><br><span>@@ -128,6 +138,7 @@</span><br><span> .in_event_mask =</span><br><span> X(NM_EV_SW_ACT),</span><br><span> .out_state_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_BTS_ST_OP_DISABLED_NOTINSTALLED) |</span><br><span> X(NM_BTS_ST_OP_DISABLED_OFFLINE),</span><br><span> .name = "DISABLED_NOTINSTALLED",</span><br><span> .onenter = st_op_disabled_notinstalled_on_enter,</span><br><span>@@ -138,6 +149,7 @@</span><br><span> X(NM_EV_OPSTART_ACK) |</span><br><span> X(NM_EV_OPSTART_NACK),</span><br><span> .out_state_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_BTS_ST_OP_DISABLED_NOTINSTALLED) |</span><br><span> X(NM_BTS_ST_OP_ENABLED),</span><br><span> .name = "DISABLED_OFFLINE",</span><br><span> .onenter = st_op_disabled_offline_on_enter,</span><br><span>@@ -145,7 +157,8 @@</span><br><span> },</span><br><span> [NM_BTS_ST_OP_ENABLED] = {</span><br><span> .in_event_mask = 0,</span><br><span style="color: hsl(0, 100%, 40%);">- .out_state_mask = 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ .out_state_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_BTS_ST_OP_DISABLED_NOTINSTALLED),</span><br><span> .name = "ENABLED",</span><br><span> .onenter = st_op_enabled_on_enter,</span><br><span> .action = st_op_enabled,</span><br><span>@@ -158,7 +171,8 @@</span><br><span> .num_states = ARRAY_SIZE(nm_bts_fsm_states),</span><br><span> .event_names = nm_fsm_event_names,</span><br><span> .allstate_action = nm_bts_allstate,</span><br><span style="color: hsl(0, 100%, 40%);">- .allstate_event_mask = X(NM_EV_SHUTDOWN_START),</span><br><span style="color: hsl(120, 100%, 40%);">+ .allstate_event_mask = X(NM_EV_SHUTDOWN_START) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_SHUTDOWN_FINISH),</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 e958917..267341e 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>@@ -41,6 +41,13 @@</span><br><span> #define nm_bts_sm_fsm_state_chg(fi, NEXT_STATE) \</span><br><span> osmo_fsm_inst_state_chg(fi, NEXT_STATE, 0, 0)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void ev_dispatch_children(struct gsm_bts_sm *site_mgr, uint32_t event)</span><br><span style="color: hsl(120, 100%, 40%);">+{</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%);">+ osmo_fsm_inst_dispatch(bts->mo.fi, event, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> //////////////////////////</span><br><span> // FSM STATE ACTIONS</span><br><span> //////////////////////////</span><br><span>@@ -105,7 +112,6 @@</span><br><span> static void nm_bts_sm_allstate(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span> {</span><br><span> struct gsm_bts_sm *site_mgr = (struct gsm_bts_sm *)fi->priv;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts *bts = gsm_bts_sm_get_bts(site_mgr);</span><br><span> </span><br><span> switch (event) {</span><br><span> case NM_EV_SHUTDOWN_START:</span><br><span>@@ -113,7 +119,12 @@</span><br><span> oml_mo_state_chg(&site_mgr->mo, -1, -1, NM_STATE_SHUTDOWN);</span><br><span> </span><br><span> /* Propagate event to children: */</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(bts->mo.fi, NM_EV_SHUTDOWN_START, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ ev_dispatch_children(site_mgr, event);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_EV_SHUTDOWN_FINISH:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Propagate event to children: */</span><br><span style="color: hsl(120, 100%, 40%);">+ ev_dispatch_children(site_mgr, event);</span><br><span style="color: hsl(120, 100%, 40%);">+ nm_bts_sm_fsm_state_chg(fi, NM_BTS_SM_ST_OP_DISABLED_NOTINSTALLED);</span><br><span> break;</span><br><span> default:</span><br><span> OSMO_ASSERT(false);</span><br><span>@@ -125,6 +136,7 @@</span><br><span> .in_event_mask =</span><br><span> X(NM_EV_SW_ACT),</span><br><span> .out_state_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_BTS_SM_ST_OP_DISABLED_NOTINSTALLED) |</span><br><span> X(NM_BTS_SM_ST_OP_DISABLED_OFFLINE),</span><br><span> .name = "DISABLED_NOTINSTALLED",</span><br><span> .onenter = st_op_disabled_notinstalled_on_enter,</span><br><span>@@ -135,6 +147,7 @@</span><br><span> X(NM_EV_OPSTART_ACK) |</span><br><span> X(NM_EV_OPSTART_NACK),</span><br><span> .out_state_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_BTS_SM_ST_OP_DISABLED_NOTINSTALLED) |</span><br><span> X(NM_BTS_SM_ST_OP_ENABLED),</span><br><span> .name = "DISABLED_OFFLINE",</span><br><span> .onenter = st_op_disabled_offline_on_enter,</span><br><span>@@ -142,7 +155,8 @@</span><br><span> },</span><br><span> [NM_BTS_SM_ST_OP_ENABLED] = {</span><br><span> .in_event_mask = 0,</span><br><span style="color: hsl(0, 100%, 40%);">- .out_state_mask = 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ .out_state_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_BTS_SM_ST_OP_DISABLED_NOTINSTALLED),</span><br><span> .name = "ENABLED",</span><br><span> .onenter = st_op_enabled_on_enter,</span><br><span> .action = st_op_enabled,</span><br><span>@@ -155,7 +169,8 @@</span><br><span> .num_states = ARRAY_SIZE(nm_bts_sm_fsm_states),</span><br><span> .event_names = nm_fsm_event_names,</span><br><span> .allstate_action = nm_bts_sm_allstate,</span><br><span style="color: hsl(0, 100%, 40%);">- .allstate_event_mask = X(NM_EV_SHUTDOWN_START),</span><br><span style="color: hsl(120, 100%, 40%);">+ .allstate_event_mask = X(NM_EV_SHUTDOWN_START) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_SHUTDOWN_FINISH),</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 fc3c8a9..e6c296f 100644</span><br><span>--- a/src/common/nm_channel_fsm.c</span><br><span>+++ b/src/common/nm_channel_fsm.c</span><br><span>@@ -177,6 +177,9 @@</span><br><span> /* Announce we start shutting down */</span><br><span> oml_mo_state_chg(&ts->mo, -1, -1, NM_STATE_SHUTDOWN);</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_EV_SHUTDOWN_FINISH:</span><br><span style="color: hsl(120, 100%, 40%);">+ nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_NOTINSTALLED);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> default:</span><br><span> OSMO_ASSERT(false);</span><br><span> }</span><br><span>@@ -187,6 +190,7 @@</span><br><span> .in_event_mask =</span><br><span> X(NM_EV_BBTRANSC_INSTALLED),</span><br><span> .out_state_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_CHAN_ST_OP_DISABLED_NOTINSTALLED) |</span><br><span> X(NM_CHAN_ST_OP_DISABLED_OFFLINE) |</span><br><span> X(NM_CHAN_ST_OP_DISABLED_DEPENDENCY),</span><br><span> .name = "DISABLED_NOTINSTALLED",</span><br><span>@@ -202,6 +206,7 @@</span><br><span> X(NM_EV_BBTRANSC_DISABLED) |</span><br><span> X(NM_EV_RCARRIER_DISABLED),</span><br><span> .out_state_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_CHAN_ST_OP_DISABLED_NOTINSTALLED) |</span><br><span> X(NM_CHAN_ST_OP_DISABLED_OFFLINE) |</span><br><span> X(NM_CHAN_ST_OP_ENABLED), /* backward compatibility, buggy BSC */</span><br><span> .name = "DISABLED_DEPENDENCY",</span><br><span>@@ -215,6 +220,7 @@</span><br><span> X(NM_EV_BBTRANSC_DISABLED) |</span><br><span> X(NM_EV_RCARRIER_DISABLED),</span><br><span> .out_state_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_CHAN_ST_OP_DISABLED_NOTINSTALLED) |</span><br><span> X(NM_CHAN_ST_OP_ENABLED) |</span><br><span> X(NM_CHAN_ST_OP_DISABLED_DEPENDENCY),</span><br><span> .name = "DISABLED_OFFLINE",</span><br><span>@@ -227,6 +233,7 @@</span><br><span> X(NM_EV_RCARRIER_DISABLED) |</span><br><span> X(NM_EV_DISABLE),</span><br><span> .out_state_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_CHAN_ST_OP_DISABLED_NOTINSTALLED) |</span><br><span> X(NM_CHAN_ST_OP_DISABLED_OFFLINE) |</span><br><span> X(NM_CHAN_ST_OP_DISABLED_DEPENDENCY),</span><br><span> .name = "ENABLED",</span><br><span>@@ -241,7 +248,8 @@</span><br><span> .num_states = ARRAY_SIZE(nm_chan_fsm_states),</span><br><span> .event_names = nm_fsm_event_names,</span><br><span> .allstate_action = nm_chan_allstate,</span><br><span style="color: hsl(0, 100%, 40%);">- .allstate_event_mask = X(NM_EV_SHUTDOWN_START),</span><br><span style="color: hsl(120, 100%, 40%);">+ .allstate_event_mask = X(NM_EV_SHUTDOWN_START) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_SHUTDOWN_FINISH),</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 3b73605..2182fef 100644</span><br><span>--- a/src/common/nm_common_fsm.c</span><br><span>+++ b/src/common/nm_common_fsm.c</span><br><span>@@ -28,6 +28,7 @@</span><br><span> { NM_EV_OPSTART_ACK, "OPSTART_ACK" },</span><br><span> { NM_EV_OPSTART_NACK, "OPSTART_NACK" },</span><br><span> { NM_EV_SHUTDOWN_START, "SHUTDOWN_START" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { NM_EV_SHUTDOWN_FINISH, "SHUTDOWN_FINISH" },</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 daae6a6..2772f19 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>@@ -180,6 +180,9 @@</span><br><span> /* Announce we start shutting down */</span><br><span> oml_mo_state_chg(&trx->mo, -1, -1, NM_STATE_SHUTDOWN);</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_EV_SHUTDOWN_FINISH:</span><br><span style="color: hsl(120, 100%, 40%);">+ nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> default:</span><br><span> OSMO_ASSERT(false);</span><br><span> }</span><br><span>@@ -195,6 +198,7 @@</span><br><span> X(NM_EV_PHYLINK_DOWN) |</span><br><span> X(NM_EV_DISABLE),</span><br><span> .out_state_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED) |</span><br><span> X(NM_RCARRIER_ST_OP_DISABLED_OFFLINE),</span><br><span> .name = "DISABLED_NOTINSTALLED",</span><br><span> .onenter = st_op_disabled_notinstalled_on_enter,</span><br><span>@@ -210,6 +214,7 @@</span><br><span> X(NM_EV_PHYLINK_DOWN) |</span><br><span> X(NM_EV_DISABLE),</span><br><span> .out_state_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED) |</span><br><span> X(NM_RCARRIER_ST_OP_ENABLED),</span><br><span> .name = "DISABLED_OFFLINE",</span><br><span> .onenter = st_op_disabled_offline_on_enter,</span><br><span>@@ -221,6 +226,7 @@</span><br><span> X(NM_EV_PHYLINK_DOWN) |</span><br><span> X(NM_EV_DISABLE),</span><br><span> .out_state_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED) |</span><br><span> X(NM_RCARRIER_ST_OP_DISABLED_OFFLINE),</span><br><span> .name = "ENABLED",</span><br><span> .onenter = st_op_enabled_on_enter,</span><br><span>@@ -234,7 +240,8 @@</span><br><span> .num_states = ARRAY_SIZE(nm_rcarrier_fsm_states),</span><br><span> .event_names = nm_fsm_event_names,</span><br><span> .allstate_action = nm_rcarrier_allstate,</span><br><span style="color: hsl(0, 100%, 40%);">- .allstate_event_mask = X(NM_EV_SHUTDOWN_START),</span><br><span style="color: hsl(120, 100%, 40%);">+ .allstate_event_mask = X(NM_EV_SHUTDOWN_START) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_SHUTDOWN_FINISH),</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/+/25491">change 25491</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/+/25491"/><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: I5c070adbba6b4abb19467a02d6449a443657ae2b </div>
<div style="display:none"> Gerrit-Change-Number: 25491 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>