<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-uecups/+/17859">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Add support for SIGUSR1 talloc report + SIGHUP logfile re-open<br><br>Change-Id: I8bfce39443fd29b6acab9a88c9fa5da54c46e824<br>---<br>M daemon/main.c<br>1 file changed, 25 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-uecups refs/changes/59/17859/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/daemon/main.c b/daemon/main.c</span><br><span>index a458e16..6ce9042 100644</span><br><span>--- a/daemon/main.c</span><br><span>+++ b/daemon/main.c</span><br><span>@@ -628,11 +628,26 @@</span><br><span> #define OSMO_VTY_PORT_UECUPS 4268</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void *g_tall_ctx;</span><br><span> struct gtp_daemon *g_daemon;</span><br><span> static int g_daemonize;</span><br><span> static char *g_config_file = "osmo-gtpu-daemon.cfg";</span><br><span> extern struct vty_app_info g_vty_info;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void signal_cb(struct osmo_signalfd *osfd, const struct signalfd_siginfo *fdsi)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (fdsi->ssi_signo) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case SIGCHLD:</span><br><span style="color: hsl(120, 100%, 40%);">+ sigchild_cb(osfd, fdsi);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case SIGUSR1:</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_report_full(g_tall_ctx, stderr);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static struct gtp_daemon *gtp_daemon_alloc(void *ctx)</span><br><span> {</span><br><span> struct gtp_daemon *d = talloc_zero(ctx, struct gtp_daemon);</span><br><span>@@ -685,23 +700,23 @@</span><br><span> </span><br><span> int main(int argc, char **argv)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- void *ctx = talloc_named_const(NULL, 0, "root");</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- g_vty_info.tall_ctx = ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_tall_ctx = talloc_named_const(NULL, 0, "root");</span><br><span style="color: hsl(120, 100%, 40%);">+ g_vty_info.tall_ctx = g_tall_ctx;</span><br><span> </span><br><span> osmo_init_ignore_signals();</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_init_logging2(ctx, &log_info);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_init_logging2(g_tall_ctx, &log_info);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- g_daemon = gtp_daemon_alloc(ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ g_daemon = gtp_daemon_alloc(g_tall_ctx);</span><br><span> OSMO_ASSERT(g_daemon);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- osmo_stats_init(ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_stats_init(g_tall_ctx);</span><br><span> vty_init(&g_vty_info);</span><br><span> logging_vty_add_cmds();</span><br><span> osmo_talloc_vty_add_cmds();</span><br><span> osmo_stats_vty_add_cmds();</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_init(ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_init(g_tall_ctx);</span><br><span> gtpud_vty_init();</span><br><span> </span><br><span> init_netns();</span><br><span>@@ -712,7 +727,7 @@</span><br><span> exit(2);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = telnet_init_dynif(ctx, NULL, vty_get_bind_addr(), OSMO_VTY_PORT_UECUPS);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = telnet_init_dynif(g_daemon, NULL, vty_get_bind_addr(), OSMO_VTY_PORT_UECUPS);</span><br><span> if (rc < 0)</span><br><span> exit(1);</span><br><span> </span><br><span>@@ -736,8 +751,10 @@</span><br><span> sigset_t sigset;</span><br><span> sigemptyset(&sigset);</span><br><span> sigaddset(&sigset, SIGCHLD);</span><br><span style="color: hsl(120, 100%, 40%);">+ sigaddset(&sigset, SIGUSR1);</span><br><span> sigprocmask(SIG_BLOCK, &sigset, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- g_daemon->signalfd = osmo_signalfd_setup(g_daemon, sigset, sigchild_cb, g_daemon);</span><br><span style="color: hsl(120, 100%, 40%);">+ g_daemon->signalfd = osmo_signalfd_setup(g_daemon, sigset, signal_cb, g_daemon);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_init_ignore_signals();</span><br><span> </span><br><span> if (g_daemonize) {</span><br><span> rc = osmo_daemonize();</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-uecups/+/17859">change 17859</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-uecups/+/17859"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-uecups </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I8bfce39443fd29b6acab9a88c9fa5da54c46e824 </div>
<div style="display:none"> Gerrit-Change-Number: 17859 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>