<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/25729">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">nm_*_fsm: Move reset state code to st_op_disabled_notinstalled_on_enter<br><br>Let's rather put it there instead of the shutdown code path, since we'll<br>be adding more and more reset coe there.<br><br>Change-Id: I43a136ade731a2c58c0a29d97875088e9b6d4414<br>---<br>M src/common/nm_bts_fsm.c<br>M src/common/nm_channel_fsm.c<br>2 files changed, 8 insertions(+), 5 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/29/25729/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/nm_bts_fsm.c b/src/common/nm_bts_fsm.c</span><br><span>index d2c48fb..c825ab5 100644</span><br><span>--- a/src/common/nm_bts_fsm.c</span><br><span>+++ b/src/common/nm_bts_fsm.c</span><br><span>@@ -57,6 +57,9 @@</span><br><span> static void st_op_disabled_notinstalled_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state)</span><br><span> {</span><br><span>        struct gsm_bts *bts = (struct gsm_bts *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+  /* Reset state: */</span><br><span style="color: hsl(120, 100%, 40%);">+    bts->si_valid = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>      bts->mo.setattr_success = false;</span><br><span>  bts->mo.opstart_success = false;</span><br><span>  oml_mo_state_chg(&bts->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED, NM_STATE_LOCKED);</span><br><span>@@ -150,8 +153,6 @@</span><br><span>     case NM_EV_SHUTDOWN_FINISH:</span><br><span>          /* Propagate event to children: */</span><br><span>           ev_dispatch_children(bts, event);</span><br><span style="color: hsl(0, 100%, 40%);">-               /* Reset state: */</span><br><span style="color: hsl(0, 100%, 40%);">-              bts->si_valid = 0;</span><br><span>                nm_bts_fsm_state_chg(fi, NM_BTS_ST_OP_DISABLED_NOTINSTALLED);</span><br><span>                break;</span><br><span>       default:</span><br><span>diff --git a/src/common/nm_channel_fsm.c b/src/common/nm_channel_fsm.c</span><br><span>index 6456005..8ffddae 100644</span><br><span>--- a/src/common/nm_channel_fsm.c</span><br><span>+++ b/src/common/nm_channel_fsm.c</span><br><span>@@ -55,6 +55,11 @@</span><br><span> static void st_op_disabled_notinstalled_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state)</span><br><span> {</span><br><span>       struct gsm_bts_trx_ts *ts = (struct gsm_bts_trx_ts *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+     /* Reset state: */</span><br><span style="color: hsl(120, 100%, 40%);">+    gsm_ts_release(ts);</span><br><span style="color: hsl(120, 100%, 40%);">+   if (ts->vamos.peer)</span><br><span style="color: hsl(120, 100%, 40%);">+                gsm_ts_release(ts->vamos.peer);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>         ts->mo.setattr_success = false;</span><br><span>   ts->mo.opstart_success = false;</span><br><span>   oml_mo_state_chg(&ts->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED, NM_STATE_LOCKED);</span><br><span>@@ -193,9 +198,6 @@</span><br><span>              oml_mo_state_chg(&ts->mo, -1, -1, NM_STATE_SHUTDOWN);</span><br><span>                 break;</span><br><span>       case NM_EV_SHUTDOWN_FINISH:</span><br><span style="color: hsl(0, 100%, 40%);">-             gsm_ts_release(ts);</span><br><span style="color: hsl(0, 100%, 40%);">-             if (ts->vamos.peer)</span><br><span style="color: hsl(0, 100%, 40%);">-                  gsm_ts_release(ts->vamos.peer);</span><br><span>           nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_NOTINSTALLED);</span><br><span>              break;</span><br><span>       default:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/25729">change 25729</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/+/25729"/><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: I43a136ade731a2c58c0a29d97875088e9b6d4414 </div>
<div style="display:none"> Gerrit-Change-Number: 25729 </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>