<p>Vadim Yanitskiy <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12584">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Vadim Yanitskiy: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trxcon/trxcon.c: do not expose tall_trx_ctx<br><br>Both l1ctl_link_init() and trx_if_open() do accept 'tall_ctx' now,<br>so there is no need to expose the root context anymore. For<br>logging initialization, we can just pass a pointer.<br><br>Change-Id: I7a2231eb880a995d3296b94481a7799e6ff07489<br>---<br>M src/host/trxcon/logging.c<br>M src/host/trxcon/logging.h<br>M src/host/trxcon/trxcon.c<br>M src/host/trxcon/trxcon.h<br>4 files changed, 14 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/trxcon/logging.c b/src/host/trxcon/logging.c</span><br><span>index 6a3043b..78915f2 100644</span><br><span>--- a/src/host/trxcon/logging.c</span><br><span>+++ b/src/host/trxcon/logging.c</span><br><span>@@ -26,7 +26,6 @@</span><br><span> #include <osmocom/core/utils.h></span><br><span> </span><br><span> #include "logging.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "trxcon.h"</span><br><span> </span><br><span> static struct log_info_cat trx_log_info_cat[] = {</span><br><span> [DAPP] = {</span><br><span>@@ -78,9 +77,9 @@</span><br><span> .num_cat = ARRAY_SIZE(trx_log_info_cat),</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int trx_log_init(const char *category_mask)</span><br><span style="color: hsl(120, 100%, 40%);">+int trx_log_init(void *tall_ctx, const char *category_mask)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_init_logging2(tall_trx_ctx, &trx_log_info);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_init_logging2(tall_ctx, &trx_log_info);</span><br><span> </span><br><span> if (category_mask)</span><br><span> log_parse_category_mask(osmo_stderr_target, category_mask);</span><br><span>diff --git a/src/host/trxcon/logging.h b/src/host/trxcon/logging.h</span><br><span>index 0206362..152c346 100644</span><br><span>--- a/src/host/trxcon/logging.h</span><br><span>+++ b/src/host/trxcon/logging.h</span><br><span>@@ -14,4 +14,4 @@</span><br><span> DSCHD,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int trx_log_init(const char *category_mask);</span><br><span style="color: hsl(120, 100%, 40%);">+int trx_log_init(void *tall_ctx, const char *category_mask);</span><br><span>diff --git a/src/host/trxcon/trxcon.c b/src/host/trxcon/trxcon.c</span><br><span>index 777138f..8e371df 100644</span><br><span>--- a/src/host/trxcon/trxcon.c</span><br><span>+++ b/src/host/trxcon/trxcon.c</span><br><span>@@ -74,7 +74,7 @@</span><br><span> uint32_t trx_fn_advance;</span><br><span> } app_data;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void *tall_trx_ctx = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+static void *tall_trxcon_ctx = NULL;</span><br><span> struct osmo_fsm_inst *trxcon_fsm;</span><br><span> </span><br><span> static void trxcon_fsm_idle_action(struct osmo_fsm_inst *fi,</span><br><span>@@ -242,7 +242,7 @@</span><br><span> case SIGABRT:</span><br><span> case SIGUSR1:</span><br><span> case SIGUSR2:</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_report_full(tall_trx_ctx, stderr);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_report_full(tall_trxcon_ctx, stderr);</span><br><span> break;</span><br><span> default:</span><br><span> break;</span><br><span>@@ -261,8 +261,8 @@</span><br><span> talloc_enable_null_tracking();</span><br><span> </span><br><span> /* Init talloc memory management system */</span><br><span style="color: hsl(0, 100%, 40%);">- tall_trx_ctx = talloc_init("trxcon context");</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_talloc_ctx_init(tall_trx_ctx, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ tall_trxcon_ctx = talloc_init("trxcon context");</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_talloc_ctx_init(tall_trxcon_ctx, 0);</span><br><span> </span><br><span> /* Setup signal handlers */</span><br><span> signal(SIGINT, &signal_handler);</span><br><span>@@ -271,20 +271,21 @@</span><br><span> osmo_init_ignore_signals();</span><br><span> </span><br><span> /* Init logging system */</span><br><span style="color: hsl(0, 100%, 40%);">- trx_log_init(app_data.debug_mask);</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_log_init(tall_trxcon_ctx, app_data.debug_mask);</span><br><span> </span><br><span> /* Allocate the application state machine */</span><br><span> osmo_fsm_register(&trxcon_fsm_def);</span><br><span style="color: hsl(0, 100%, 40%);">- trxcon_fsm = osmo_fsm_inst_alloc(&trxcon_fsm_def, tall_trx_ctx,</span><br><span style="color: hsl(120, 100%, 40%);">+ trxcon_fsm = osmo_fsm_inst_alloc(&trxcon_fsm_def, tall_trxcon_ctx,</span><br><span> NULL, LOGL_DEBUG, "main");</span><br><span> </span><br><span> /* Init L1CTL server */</span><br><span style="color: hsl(0, 100%, 40%);">- app_data.l1l = l1ctl_link_init(tall_trx_ctx, app_data.bind_socket);</span><br><span style="color: hsl(120, 100%, 40%);">+ app_data.l1l = l1ctl_link_init(tall_trxcon_ctx,</span><br><span style="color: hsl(120, 100%, 40%);">+ app_data.bind_socket);</span><br><span> if (app_data.l1l == NULL)</span><br><span> goto exit;</span><br><span> </span><br><span> /* Init transceiver interface */</span><br><span style="color: hsl(0, 100%, 40%);">- app_data.trx = trx_if_open(tall_trx_ctx,</span><br><span style="color: hsl(120, 100%, 40%);">+ app_data.trx = trx_if_open(tall_trxcon_ctx,</span><br><span> app_data.trx_bind_ip, app_data.trx_remote_ip,</span><br><span> app_data.trx_base_port);</span><br><span> if (!app_data.trx)</span><br><span>@@ -331,8 +332,8 @@</span><br><span> * Print report for the root talloc context in order</span><br><span> * to be able to find and fix potential memory leaks.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_report_full(tall_trx_ctx, stderr);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(tall_trx_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_report_full(tall_trxcon_ctx, stderr);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(tall_trxcon_ctx);</span><br><span> </span><br><span> /* Make both Valgrind and ASAN happy */</span><br><span> talloc_report_full(NULL, stderr);</span><br><span>diff --git a/src/host/trxcon/trxcon.h b/src/host/trxcon/trxcon.h</span><br><span>index 65b5e85..f66a628 100644</span><br><span>--- a/src/host/trxcon/trxcon.h</span><br><span>+++ b/src/host/trxcon/trxcon.h</span><br><span>@@ -3,7 +3,6 @@</span><br><span> #define GEN_MASK(state) (0x01 << state)</span><br><span> </span><br><span> extern struct osmo_fsm_inst *trxcon_fsm;</span><br><span style="color: hsl(0, 100%, 40%);">-extern void *tall_trx_ctx;</span><br><span> </span><br><span> enum trxcon_fsm_states {</span><br><span> TRXCON_STATE_IDLE = 0,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12584">change 12584</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/12584"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I7a2231eb880a995d3296b94481a7799e6ff07489 </div>
<div style="display:none"> Gerrit-Change-Number: 12584 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-CC: Harald Welte <laforge@gnumonks.org> </div>