<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/21351">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;">main: 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: Iff66eea9ee70850a4d038ece1d8473457023e1ee<br>Fixes: OS#4865<br>---<br>M src/osmo-msc/msc_main.c<br>1 file changed, 15 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c</span><br><span>index aefdcbf..fcca101 100644</span><br><span>--- a/src/osmo-msc/msc_main.c</span><br><span>+++ b/src/osmo-msc/msc_main.c</span><br><span>@@ -273,20 +273,29 @@</span><br><span> static struct gsm_network *msc_network = NULL;</span><br><span> </span><br><span> extern void *tall_vty_ctx;</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(stdout, "signal %u received\n", signal);</span><br><span style="color: hsl(120, 100%, 40%);">+    fprintf(stdout, "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>         case SIGTERM:</span><br><span style="color: hsl(0, 100%, 40%);">-           LOGP(DMSC, LOGL_NOTICE, "Terminating due to signal %d\n", signal);</span><br><span style="color: hsl(120, 100%, 40%);">+          LOGP(DMSC, LOGL_NOTICE, "Terminating due to signal %d\n", signum);</span><br><span>                 quit++;</span><br><span>              break;</span><br><span>       case SIGABRT:</span><br><span>                osmo_generate_backtrace();</span><br><span style="color: hsl(0, 100%, 40%);">-              /* in case of abort, we want to obtain a talloc report</span><br><span style="color: hsl(0, 100%, 40%);">-           * and then return to the caller, who will abort the process */</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(tall_vty_ctx, stderr);</span><br><span style="color: hsl(120, 100%, 40%);">+          talloc_report_full(tall_msc_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>                talloc_report(tall_vty_ctx, stderr);</span><br><span>                 talloc_report_full(tall_msc_ctx, stderr);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/21351">change 21351</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-msc/+/21351"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Iff66eea9ee70850a4d038ece1d8473457023e1ee </div>
<div style="display:none"> Gerrit-Change-Number: 21351 </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>