<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/21357">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">oc2g-mgr: generate coredump and exit upon SIGABRT received<br><br>Previous code relied on abort() switching sigaction to SIG_FDL +<br>retriggering SIGABRT in case the signal handler returns, which would<br>then generate the coredump + terminate the process.<br>However, if a SIGABRT is received from somewhere else (kill -SIGABRT),<br>then the process would print the talloc report and continue running,<br>which is not desired.<br><br>Change-Id: I7a5756e106ac1061d37b42c22cc127fdacd87ce7<br>Fixes: OS#4865<br>---<br>M src/osmo-bts-oc2g/misc/oc2gbts_mgr.c<br>1 file changed, 15 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-oc2g/misc/oc2gbts_mgr.c b/src/osmo-bts-oc2g/misc/oc2gbts_mgr.c</span><br><span>index 66c9f28..9469259 100644</span><br><span>--- a/src/osmo-bts-oc2g/misc/oc2gbts_mgr.c</span><br><span>+++ b/src/osmo-bts-oc2g/misc/oc2gbts_mgr.c</span><br><span>@@ -1,7 +1,7 @@</span><br><span> /* Main program for NuRAN Wireless OC-2G BTS management daemon */</span><br><span> </span><br><span> /* Copyright (C) 2015 by Yves Godin <support@nuranwireless.com></span><br><span style="color: hsl(0, 100%, 40%);">- * </span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span> * Based on sysmoBTS:</span><br><span> * sysmobts_mgr.c</span><br><span> * (C) 2012 by Harald Welte <laforge@gnumonks.org></span><br><span>@@ -201,11 +201,11 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void signal_handler(int signal)</span><br><span style="color: hsl(120, 100%, 40%);">+static void signal_handler(int signum)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "signal %u received\n", signal);</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "signal %u received\n", signum);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- switch (signal) {</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (signum) {</span><br><span> case SIGINT:</span><br><span> oc2gbts_check_temp(no_rom_write);</span><br><span> oc2gbts_check_power(no_rom_write);</span><br><span>@@ -214,6 +214,16 @@</span><br><span> exit(0);</span><br><span> break;</span><br><span> case SIGABRT:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* in case of abort, we want to obtain a talloc report and</span><br><span style="color: hsl(120, 100%, 40%);">+ * then run default SIGABRT handler, who will generate coredump</span><br><span style="color: hsl(120, 100%, 40%);">+ * and abort the process. abort() should do this for us after we</span><br><span style="color: hsl(120, 100%, 40%);">+ * return, but program wouldn't exit if an external SIGABRT is</span><br><span style="color: hsl(120, 100%, 40%);">+ * received.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_report_full(tall_mgr_ctx, stderr);</span><br><span style="color: hsl(120, 100%, 40%);">+ signal(SIGABRT, SIG_DFL);</span><br><span style="color: hsl(120, 100%, 40%);">+ raise(SIGABRT);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> case SIGUSR1:</span><br><span> case SIGUSR2:</span><br><span> talloc_report_full(tall_mgr_ctx, stderr);</span><br><span>@@ -280,6 +290,7 @@</span><br><span> </span><br><span> osmo_init_ignore_signals();</span><br><span> signal(SIGINT, &signal_handler);</span><br><span style="color: hsl(120, 100%, 40%);">+ signal(SIGABRT, &signal_handler);</span><br><span> signal(SIGUSR1, &signal_handler);</span><br><span> signal(SIGUSR2, &signal_handler);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/21357">change 21357</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/+/21357"/><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: I7a5756e106ac1061d37b42c22cc127fdacd87ce7 </div>
<div style="display:none"> Gerrit-Change-Number: 21357 </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-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>