<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13269">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">oml: use oml_tx_failure_event_rep() instead of signals to SS_FAIL<br><br>At some locations in the code a signal to SS_FAIL is dispatched in order<br>to trigger the sending of an OML failure event report in oml.c. This is<br>a bit overcomplicated for the task. Lets use oml_tx_failure_event_rep()<br>to send the failure event reports and lets remove the signal handler for<br>SS_FAIL.<br><br>Change-Id: Ie4fce1273a19cc14f37ff6fc7582b2945c7e7c47<br>Related: OS#3843<br>---<br>M include/osmo-bts/signal.h<br>M src/common/bts_ctrl_commands.c<br>M src/common/oml.c<br>M src/common/pcu_sock.c<br>4 files changed, 10 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/signal.h b/include/osmo-bts/signal.h</span><br><span>index 01d4099..c8168a2 100644</span><br><span>--- a/include/osmo-bts/signal.h</span><br><span>+++ b/include/osmo-bts/signal.h</span><br><span>@@ -5,7 +5,6 @@</span><br><span> </span><br><span> enum sig_subsys {</span><br><span> SS_GLOBAL,</span><br><span style="color: hsl(0, 100%, 40%);">- SS_FAIL,</span><br><span> };</span><br><span> </span><br><span> enum signals_global {</span><br><span>diff --git a/src/common/bts_ctrl_commands.c b/src/common/bts_ctrl_commands.c</span><br><span>index 4efb4ee..47d8a5d 100644</span><br><span>--- a/src/common/bts_ctrl_commands.c</span><br><span>+++ b/src/common/bts_ctrl_commands.c</span><br><span>@@ -34,6 +34,8 @@</span><br><span> #include <osmo-bts/oml.h></span><br><span> #include <osmo-bts/bts.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static struct gsm_bts *g_bts;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> CTRL_CMD_DEFINE(therm_att, "thermal-attenuation");</span><br><span> static int get_therm_att(struct ctrl_cmd *cmd, void *data)</span><br><span> {</span><br><span>@@ -75,7 +77,7 @@</span><br><span> static int set_oml_alert(struct ctrl_cmd *cmd, void *data)</span><br><span> {</span><br><span> /* Note: we expect signal dispatch to be synchronous */</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_signal_dispatch(SS_FAIL, OSMO_EVT_EXT_ALARM, cmd->value);</span><br><span style="color: hsl(120, 100%, 40%);">+ oml_tx_failure_event_rep(&g_bts->mo, OSMO_EVT_EXT_ALARM, cmd->value);</span><br><span> </span><br><span> cmd->reply = "OK";</span><br><span> </span><br><span>@@ -88,6 +90,7 @@</span><br><span> </span><br><span> rc |= ctrl_cmd_install(CTRL_NODE_TRX, &cmd_therm_att);</span><br><span> rc |= ctrl_cmd_install(CTRL_NODE_ROOT, &cmd_oml_alert);</span><br><span style="color: hsl(120, 100%, 40%);">+ g_bts = bts;</span><br><span> </span><br><span> return rc;</span><br><span> }</span><br><span>diff --git a/src/common/oml.c b/src/common/oml.c</span><br><span>index 7ff5967..c96a893 100644</span><br><span>--- a/src/common/oml.c</span><br><span>+++ b/src/common/oml.c</span><br><span>@@ -1493,23 +1493,11 @@</span><br><span> return ret;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int handle_fail_sig(unsigned int subsys, unsigned int signal, void *handle,</span><br><span style="color: hsl(0, 100%, 40%);">- void *signal_data)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- if (signal_data)</span><br><span style="color: hsl(0, 100%, 40%);">- oml_tx_failure_event_rep(handle, signal, "%s", signal_data);</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- oml_tx_failure_event_rep(handle, signal, "");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> int oml_init(struct gsm_abis_mo *mo)</span><br><span> {</span><br><span> DEBUGP(DOML, "Initializing OML attribute definitions\n");</span><br><span> tlv_def_patch(&abis_nm_att_tlvdef_ipa_local, &abis_nm_att_tlvdef_ipa);</span><br><span> tlv_def_patch(&abis_nm_att_tlvdef_ipa_local, &abis_nm_att_tlvdef);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_signal_register_handler(SS_FAIL, handle_fail_sig, mo);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c</span><br><span>index 2c7028e..440f561 100644</span><br><span>--- a/src/common/pcu_sock.c</span><br><span>+++ b/src/common/pcu_sock.c</span><br><span>@@ -43,6 +43,7 @@</span><br><span> #include <osmo-bts/rsl.h></span><br><span> #include <osmo-bts/signal.h></span><br><span> #include <osmo-bts/l1sap.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmo-bts/oml.h></span><br><span> </span><br><span> uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx);</span><br><span> </span><br><span>@@ -577,7 +578,7 @@</span><br><span> case PCU_VERSION:</span><br><span> LOGP(DPCU, LOGL_INFO, "OsmoPCU version %s connected\n",</span><br><span> txt->text);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_signal_dispatch(SS_FAIL, OSMO_EVT_PCU_VERS, txt->text);</span><br><span style="color: hsl(120, 100%, 40%);">+ oml_tx_failure_event_rep(&bts->gprs.cell.mo, OSMO_EVT_PCU_VERS, txt->text);</span><br><span> osmo_strlcpy(bts->pcu_version, txt->text, MAX_VERSION_LENGTH);</span><br><span> </span><br><span> if (GSM_BTS_HAS_SI(bts, SYSINFO_TYPE_13))</span><br><span>@@ -586,7 +587,7 @@</span><br><span> LOGP(DPCU, LOGL_INFO, "SI13 is not available on PCU connection\n");</span><br><span> break;</span><br><span> case PCU_OML_ALERT:</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_signal_dispatch(SS_FAIL, OSMO_EVT_EXT_ALARM, txt->text);</span><br><span style="color: hsl(120, 100%, 40%);">+ oml_tx_failure_event_rep(&bts->gprs.cell.mo, OSMO_EVT_EXT_ALARM, txt->text);</span><br><span> break;</span><br><span> default:</span><br><span> LOGP(DPCU, LOGL_ERROR, "Unknown TXT_IND type %u received\n",</span><br><span>@@ -713,7 +714,9 @@</span><br><span> bts = llist_entry(state->net->bts_list.next, struct gsm_bts, list);</span><br><span> </span><br><span> LOGP(DPCU, LOGL_NOTICE, "PCU socket has LOST connection\n");</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_signal_dispatch(SS_FAIL, OSMO_EVT_PCU_VERS, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ oml_tx_failure_event_rep(&bts->gprs.cell.mo, OSMO_EVT_PCU_VERS,</span><br><span style="color: hsl(120, 100%, 40%);">+ "PCU socket has LOST connection");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> bts->pcu_version[0] = '\0';</span><br><span> </span><br><span> close(bfd->fd);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13269">change 13269</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/13269"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ie4fce1273a19cc14f37ff6fc7582b2945c7e7c47 </div>
<div style="display:none"> Gerrit-Change-Number: 13269 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>