<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-remsim/+/14883">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;">track libulfius and jansson memory allocations with talloc<br><br>Change-Id: I0ad63a79a806b420ea0de42b67726da36ebac828<br>---<br>M configure.ac<br>M src/server/Makefile.am<br>M src/server/remsim_server.c<br>M src/server/rest_api.c<br>M src/server/rest_api.h<br>5 files changed, 40 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configure.ac b/configure.ac</span><br><span>index e87c8c8..2fc603d 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -45,6 +45,7 @@</span><br><span> [osmo_ac_build_server="$enableval"],[osmo_ac_build_server="yes"])</span><br><span> if test "$osmo_ac_build_server" = "yes"; then</span><br><span> PKG_CHECK_MODULES(ULFIUS, libulfius)</span><br><span style="color: hsl(120, 100%, 40%);">+ PKG_CHECK_MODULES(ORCANIA, liborcania)</span><br><span> PKG_CHECK_MODULES(JANSSON, jansson)</span><br><span> AC_DEFINE(BUILD_SERVER, 1, [Define if we want to build osmo-remsim-server])</span><br><span> fi</span><br><span>diff --git a/src/server/Makefile.am b/src/server/Makefile.am</span><br><span>index ce114b6..f6278a3 100644</span><br><span>--- a/src/server/Makefile.am</span><br><span>+++ b/src/server/Makefile.am</span><br><span>@@ -2,7 +2,7 @@</span><br><span> AM_CFLAGS = -Wall -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src \</span><br><span> -I$(top_srcdir)/include/osmocom/rspro \</span><br><span> $(OSMOCORE_CFLAGS) $(OSMOGSM_CFLAGS) $(OSMOABIS_CFLAGS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(ULFIUS_CFLAGS) $(JANSSON_CFLAGS)</span><br><span style="color: hsl(120, 100%, 40%);">+ $(ULFIUS_CFLAGS) $(JANSSON_CFLAGS) $(ORCANIA_CFLAGS)</span><br><span> </span><br><span> noinst_HEADERS = rspro_server.h rest_api.h</span><br><span> </span><br><span>@@ -11,7 +11,7 @@</span><br><span> osmo_remsim_server_SOURCES = remsim_server.c rspro_server.c rest_api.c \</span><br><span> ../rspro_util.c ../slotmap.c ../debug.c</span><br><span> osmo_remsim_server_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(ULFIUS_LIBS) $(JANSSON_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(ULFIUS_LIBS) $(JANSSON_LIBS) $(ORCANIA_LIBS) \</span><br><span> $(top_builddir)/src/libosmo-rspro.la</span><br><span> </span><br><span> # as suggested in http://lists.gnu.org/archive/html/automake/2009-03/msg00011.html</span><br><span>diff --git a/src/server/remsim_server.c b/src/server/remsim_server.c</span><br><span>index a8502e4..70cbedc 100644</span><br><span>--- a/src/server/remsim_server.c</span><br><span>+++ b/src/server/remsim_server.c</span><br><span>@@ -27,10 +27,12 @@</span><br><span> </span><br><span> int main(int argc, char **argv)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ void *talloc_rest_ctx;</span><br><span> int rc;</span><br><span> </span><br><span> g_tall_ctx = talloc_named_const(NULL, 0, "global");</span><br><span> talloc_asn1_ctx = talloc_named_const(g_tall_ctx, 0, "asn1");</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_rest_ctx = talloc_named_const(g_tall_ctx, 0, "rest");</span><br><span> msgb_talloc_ctx_init(g_tall_ctx, 0);</span><br><span> </span><br><span> osmo_init_logging2(g_tall_ctx, &log_info);</span><br><span>@@ -56,7 +58,7 @@</span><br><span> </span><br><span> signal(SIGUSR1, handle_sig_usr1);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = rest_api_init(9997);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = rest_api_init(talloc_rest_ctx, 9997);</span><br><span> if (rc < 0)</span><br><span> goto out_eventfd;</span><br><span> </span><br><span>diff --git a/src/server/rest_api.c b/src/server/rest_api.c</span><br><span>index b990664..969f672 100644</span><br><span>--- a/src/server/rest_api.c</span><br><span>+++ b/src/server/rest_api.c</span><br><span>@@ -1,9 +1,11 @@</span><br><span> #include <string.h></span><br><span> #include <stdlib.h></span><br><span> #include <errno.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <pthread.h></span><br><span> </span><br><span> #include <jansson.h></span><br><span> #include <ulfius.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <orcania.h></span><br><span> </span><br><span> #include <osmocom/core/utils.h></span><br><span> #include <osmocom/core/linuxlist.h></span><br><span>@@ -461,13 +463,43 @@</span><br><span> };</span><br><span> </span><br><span> static struct _u_instance g_instance;</span><br><span style="color: hsl(120, 100%, 40%);">+static pthread_mutex_t g_tall_lock = PTHREAD_MUTEX_INITIALIZER;</span><br><span style="color: hsl(120, 100%, 40%);">+static void *g_tall_rest;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int rest_api_init(uint16_t port)</span><br><span style="color: hsl(120, 100%, 40%);">+static void *my_o_malloc(size_t sz)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ void *obj;</span><br><span style="color: hsl(120, 100%, 40%);">+ pthread_mutex_lock(&g_tall_lock);</span><br><span style="color: hsl(120, 100%, 40%);">+ obj = talloc_size(g_tall_rest, sz);</span><br><span style="color: hsl(120, 100%, 40%);">+ pthread_mutex_unlock(&g_tall_lock);</span><br><span style="color: hsl(120, 100%, 40%);">+ return obj;</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%);">+static void *my_o_realloc(void *obj, size_t sz)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ pthread_mutex_lock(&g_tall_lock);</span><br><span style="color: hsl(120, 100%, 40%);">+ obj = talloc_realloc_size(g_tall_rest, obj, sz);</span><br><span style="color: hsl(120, 100%, 40%);">+ pthread_mutex_unlock(&g_tall_lock);</span><br><span style="color: hsl(120, 100%, 40%);">+ return obj;</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%);">+static void my_o_free(void *obj)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ pthread_mutex_lock(&g_tall_lock);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(obj);</span><br><span style="color: hsl(120, 100%, 40%);">+ pthread_mutex_unlock(&g_tall_lock);</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%);">+int rest_api_init(void *ctx, uint16_t port)</span><br><span> {</span><br><span> int i;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ g_tall_rest = ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+ o_set_alloc_funcs(my_o_malloc, my_o_realloc, my_o_free);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (ulfius_init_instance(&g_instance, port, NULL, NULL) != U_OK)</span><br><span> return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_instance.mhd_response_copy_data = 1;</span><br><span> </span><br><span> for (i = 0; i < ARRAY_SIZE(api_endpoints); i++)</span><br><span> ulfius_add_endpoint(&g_instance, &api_endpoints[i]);</span><br><span>diff --git a/src/server/rest_api.h b/src/server/rest_api.h</span><br><span>index 87269e8..dfba65d 100644</span><br><span>--- a/src/server/rest_api.h</span><br><span>+++ b/src/server/rest_api.h</span><br><span>@@ -1,5 +1,5 @@</span><br><span> #pragma once</span><br><span> #include <stdint.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int rest_api_init(uint16_t port);</span><br><span style="color: hsl(120, 100%, 40%);">+int rest_api_init(void *ctx, uint16_t port);</span><br><span> void rest_api_fini(void);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-remsim/+/14883">change 14883</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-remsim/+/14883"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-remsim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I0ad63a79a806b420ea0de42b67726da36ebac828 </div>
<div style="display:none"> Gerrit-Change-Number: 14883 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>