<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/25531">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bts_shutdown_fsm: Allow configuring FSM to shutdown without exiting process<br><br>This feature is not yet used by any bts_shutdown_fsm caller, but will be<br>used in the future when Abis link goes down.<br><br>Change-Id: I5dc282fdbcf862067be326e72b6183dd544222ae<br>---<br>M include/osmo-bts/bts.h<br>M src/common/bts_shutdown_fsm.c<br>2 files changed, 20 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/31/25531/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h</span><br><span>index d3cb6bf..a601423 100644</span><br><span>--- a/include/osmo-bts/bts.h</span><br><span>+++ b/include/osmo-bts/bts.h</span><br><span>@@ -368,6 +368,7 @@</span><br><span> } gsmtap;</span><br><span> </span><br><span> struct osmo_fsm_inst *shutdown_fi; /* FSM instance to manage shutdown procedure during process exit */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool shutdown_fi_exit_proc; /* exit process when shutdown_fsm is finished? */</span><br><span> struct osmo_fsm_inst *abis_link_fi; /* FSM instance to manage abis connection during process startup and link failure */</span><br><span> struct osmo_tdef *T_defs; /* Timer defines */</span><br><span> </span><br><span>@@ -390,6 +391,7 @@</span><br><span> </span><br><span> int bts_init(struct gsm_bts *bts);</span><br><span> void bts_shutdown(struct gsm_bts *bts, const char *reason);</span><br><span style="color: hsl(120, 100%, 40%);">+void bts_shutdown_ext(struct gsm_bts *bts, const char *reason, bool exit_proc);</span><br><span> </span><br><span> int bts_link_estab(struct gsm_bts *bts);</span><br><span> </span><br><span>diff --git a/src/common/bts_shutdown_fsm.c b/src/common/bts_shutdown_fsm.c</span><br><span>index c16b76a..47888b8 100644</span><br><span>--- a/src/common/bts_shutdown_fsm.c</span><br><span>+++ b/src/common/bts_shutdown_fsm.c</span><br><span>@@ -156,8 +156,11 @@</span><br><span> </span><br><span> osmo_fsm_inst_dispatch(bts->site_mgr.mo.fi, NM_EV_SHUTDOWN_FINISH, NULL);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGPFSML(fi, LOGL_NOTICE, "Shutdown process completed successfuly, exiting process\n");</span><br><span style="color: hsl(0, 100%, 40%);">- exit(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->shutdown_fi_exit_proc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFSML(fi, LOGL_NOTICE, "Shutdown process completed successfuly, exiting process\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_shutdown_fsm_state_chg(fi, BTS_SHUTDOWN_ST_NONE);</span><br><span> }</span><br><span> </span><br><span> static struct osmo_fsm_state bts_shutdown_fsm_states[] = {</span><br><span>@@ -190,6 +193,8 @@</span><br><span> },</span><br><span> [BTS_SHUTDOWN_ST_EXIT] = {</span><br><span> .name = "EXIT",</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_NONE),</span><br><span> .onenter = st_exit_on_enter,</span><br><span> }</span><br><span> };</span><br><span>@@ -232,18 +237,26 @@</span><br><span> OSMO_ASSERT(osmo_fsm_register(&bts_shutdown_fsm) == 0);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void bts_shutdown(struct gsm_bts *bts, const char *reason)</span><br><span style="color: hsl(120, 100%, 40%);">+void bts_shutdown_ext(struct gsm_bts *bts, const char *reason, bool exit_proc)</span><br><span> {</span><br><span> struct osmo_fsm_inst *fi = bts->shutdown_fi;</span><br><span> if (fi->state != BTS_SHUTDOWN_ST_NONE) {</span><br><span> LOGPFSML(fi, LOGL_NOTICE, "BTS is already being shutdown.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (exit_proc)</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->shutdown_fi_exit_proc = true;</span><br><span> return;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPFSML(fi, LOGL_NOTICE, "Shutting down BTS, reason: %s\n", reason);</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->shutdown_fi_exit_proc = exit_proc;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFSML(fi, LOGL_NOTICE, "Shutting down BTS, exit %u, reason: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ exit_proc, reason);</span><br><span> osmo_fsm_inst_dispatch(fi, BTS_SHUTDOWN_EV_START, NULL);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void bts_shutdown(struct gsm_bts *bts, const char *reason)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_shutdown_ext(bts, reason, true);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void bts_model_trx_close_cb(struct gsm_bts_trx *trx, int rc)</span><br><span> {</span><br><span> struct osmo_fsm_inst *fi = trx->bts->shutdown_fi;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/25531">change 25531</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/+/25531"/><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: I5dc282fdbcf862067be326e72b6183dd544222ae </div>
<div style="display:none"> Gerrit-Change-Number: 25531 </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>