<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/19108">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Hoernchen: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bts_shutdown: Speed up shutdown if no TRX is operational<br><br>This change avoids waiting for full ramp down if TRXs are already non<br>operational.<br><br>Change-Id: Ie1c7c3a969e7968075b89edcd1ab2227b178a869<br>---<br>M src/common/bts_shutdown_fsm.c<br>1 file changed, 36 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/bts_shutdown_fsm.c b/src/common/bts_shutdown_fsm.c</span><br><span>index d8a8d11..d55b1cd 100644</span><br><span>--- a/src/common/bts_shutdown_fsm.c</span><br><span>+++ b/src/common/bts_shutdown_fsm.c</span><br><span>@@ -22,6 +22,7 @@</span><br><span> </span><br><span> #include <osmocom/core/fsm.h></span><br><span> #include <osmocom/core/tdef.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/protocol/gsm_12_21.h></span><br><span> </span><br><span> #include <osmo-bts/bts_shutdown_fsm.h></span><br><span> #include <osmo-bts/logging.h></span><br><span>@@ -38,11 +39,33 @@</span><br><span> #define bts_shutdown_fsm_state_chg(fi, NEXT_STATE) \</span><br><span> osmo_tdef_fsm_inst_state_chg(fi, NEXT_STATE, bts_shutdown_fsm_timeouts, ((struct gsm_bts *)fi->priv)->T_defs, -1)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static unsigned int count_trx_operational(struct gsm_bts *bts) {</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int count = 0;</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%);">+ if (trx->mo.nm_state.operational == NM_OPSTATE_ENABLED)</span><br><span style="color: hsl(120, 100%, 40%);">+ count++;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return count;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static void st_none(struct osmo_fsm_inst *fi, uint32_t event, void *data)</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%);">+ unsigned int count;</span><br><span> switch(event) {</span><br><span> case BTS_SHUTDOWN_EV_START:</span><br><span style="color: hsl(0, 100%, 40%);">- bts_shutdown_fsm_state_chg(fi, BTS_SHUTDOWN_ST_WAIT_RAMP_DOWN_COMPL);</span><br><span style="color: hsl(120, 100%, 40%);">+ count = count_trx_operational(bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (count) {</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_shutdown_fsm_state_chg(fi, BTS_SHUTDOWN_ST_WAIT_RAMP_DOWN_COMPL);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* we can skip ramp down since no TRX is running anyway.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Let's jump into WAIT_TRX_CLOSED to make sure we</span><br><span style="color: hsl(120, 100%, 40%);">+ * tell lower layer to close all TRX in case there's some</span><br><span style="color: hsl(120, 100%, 40%);">+ * open() WIP */</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFSML(fi, LOGL_INFO, "No TRX is operational, skipping power ramp down\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_shutdown_fsm_state_chg(fi, BTS_SHUTDOWN_ST_WAIT_TRX_CLOSED);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> break;</span><br><span> }</span><br><span> }</span><br><span>@@ -56,8 +79,11 @@</span><br><span> struct gsm_bts *bts = (struct gsm_bts *)fi->priv;</span><br><span> struct gsm_bts_trx *trx;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(trx, &bts->trx_list, list)</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%);">+ if (trx->mo.nm_state.operational != NM_OPSTATE_ENABLED)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span> power_ramp_start(trx, to_mdB(-10), 1, ramp_down_compl_cb);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> static void st_wait_ramp_down_compl(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span>@@ -72,7 +98,8 @@</span><br><span> src_trx = (struct gsm_bts_trx *)data;</span><br><span> </span><br><span> llist_for_each_entry(trx, &bts->trx_list, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (trx->power_params.p_total_cur_mdBm > 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trx->mo.nm_state.operational == NM_OPSTATE_ENABLED &&</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->power_params.p_total_cur_mdBm > 0)</span><br><span> remaining++;</span><br><span> }</span><br><span> </span><br><span>@@ -100,17 +127,13 @@</span><br><span> static void st_wait_trx_closed(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 *src_trx, *trx;</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int remaining = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx *src_trx;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int remaining;</span><br><span> </span><br><span> switch(event) {</span><br><span> case BTS_SHUTDOWN_EV_TRX_CLOSED:</span><br><span> src_trx = (struct gsm_bts_trx *)data;</span><br><span style="color: hsl(0, 100%, 40%);">-</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%);">- if (trx->mo.nm_state.operational != NM_OPSTATE_DISABLED)</span><br><span style="color: hsl(0, 100%, 40%);">- remaining++;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ remaining = count_trx_operational(bts);</span><br><span> </span><br><span> LOGPFSML(fi, LOGL_INFO, "%s TRX closed, %u TRX remaining\n",</span><br><span> gsm_trx_name(src_trx), remaining);</span><br><span>@@ -130,7 +153,9 @@</span><br><span> [BTS_SHUTDOWN_ST_NONE] = {</span><br><span> .in_event_mask =</span><br><span> X(BTS_SHUTDOWN_EV_START),</span><br><span style="color: hsl(0, 100%, 40%);">- .out_state_mask = X(BTS_SHUTDOWN_ST_WAIT_RAMP_DOWN_COMPL),</span><br><span style="color: hsl(120, 100%, 40%);">+ .out_state_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(BTS_SHUTDOWN_ST_WAIT_RAMP_DOWN_COMPL) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(BTS_SHUTDOWN_ST_WAIT_TRX_CLOSED),</span><br><span> .name = "NONE",</span><br><span> .action = st_none,</span><br><span> },</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/19108">change 19108</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/+/19108"/><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: Ie1c7c3a969e7968075b89edcd1ab2227b178a869 </div>
<div style="display:none"> Gerrit-Change-Number: 19108 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Hoernchen <ewild@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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>