<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/15560">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">logging: Introduce mutex API to manage log_target in multi-thread envs<br><br>log_enable_multithread() enables use of locks inside the<br>implementation. Lock use is disabled by default, this way only<br>multi-thread processes need to enable it and suffer related<br>complexity/performance penalties.<br><br>Locks are required around osmo_log_target_list and items inside it,<br>since targets can be used, modified and deleted by different threads<br>concurrently (for instance, user writing "logging disable" in VTY while<br>another thread is willing to write into that target).<br><br>Multithread apps and libraries aiming at being used in multithread apps<br>should update their code to use the locks introduced here when<br>containing code iterating over osmo_log_target_list explictly or<br>implicitly by obtaining a log_target (eg. osmo_log_vty2tgt()).<br><br>Related: OS#4088<br>Change-Id: Id7711893b34263baacac6caf4d489467053131bb<br>---<br>M configure.ac<br>M include/osmocom/core/logging.h<br>M libosmocore.pc.in<br>A m4/ax_pthread.m4<br>M src/Makefile.am<br>M src/gb/gprs_bssgp_vty.c<br>M src/gb/gprs_ns_vty.c<br>M src/logging.c<br>M src/vty/logging_vty.c<br>M tests/Makefile.am<br>M tests/logging/logging_vty_test.c<br>M utils/Makefile.am<br>12 files changed, 709 insertions(+), 100 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 7ad5908..39d232b 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -68,6 +68,9 @@</span><br><span> AC_CHECK_LIB(execinfo, backtrace, BACKTRACE_LIB=-lexecinfo, BACKTRACE_LIB=)</span><br><span> AC_SUBST(BACKTRACE_LIB)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# check for pthread (PTHREAD_CFLAGS, PTHREAD_LIBS)</span><br><span style="color: hsl(120, 100%, 40%);">+AX_PTHREAD</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # check for old glibc < 2.17 to get clock_gettime</span><br><span> AC_SEARCH_LIBS([clock_gettime], [rt posix4], [LIBRARY_RT="$LIBS";LIBS=""])</span><br><span> AC_SUBST(LIBRARY_RT)</span><br><span>diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h</span><br><span>index 1a2d60b..139d291 100644</span><br><span>--- a/include/osmocom/core/logging.h</span><br><span>+++ b/include/osmocom/core/logging.h</span><br><span>@@ -380,4 +380,18 @@</span><br><span> </span><br><span> struct log_target *log_target_find(int type, const char *fname);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void log_enable_multithread(void);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void log_tgt_mutex_lock_impl(void);</span><br><span style="color: hsl(120, 100%, 40%);">+void log_tgt_mutex_unlock_impl(void);</span><br><span style="color: hsl(120, 100%, 40%);">+#define LOG_MTX_DEBUG 0</span><br><span style="color: hsl(120, 100%, 40%);">+#if LOG_MTX_DEBUG</span><br><span style="color: hsl(120, 100%, 40%);">+ #include <pthread.h></span><br><span style="color: hsl(120, 100%, 40%);">+ #define log_tgt_mutex_lock() do { fprintf(stderr, "[%lu] %s:%d [%s] lock\n", pthread_self(), __FILE__, __LINE__, __func__); log_tgt_mutex_lock_impl(); } while (0)</span><br><span style="color: hsl(120, 100%, 40%);">+ #define log_tgt_mutex_unlock() do { fprintf(stderr, "[%lu] %s:%d [%s] unlock\n", pthread_self(), __FILE__, __LINE__, __func__); log_tgt_mutex_unlock_impl(); } while (0)</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+ #define log_tgt_mutex_lock() log_tgt_mutex_lock_impl()</span><br><span style="color: hsl(120, 100%, 40%);">+ #define log_tgt_mutex_unlock() log_tgt_mutex_unlock_impl()</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! @} */</span><br><span>diff --git a/libosmocore.pc.in b/libosmocore.pc.in</span><br><span>index d355659..ce82d4f 100644</span><br><span>--- a/libosmocore.pc.in</span><br><span>+++ b/libosmocore.pc.in</span><br><span>@@ -7,5 +7,5 @@</span><br><span> Description: C Utility Library</span><br><span> Version: @VERSION@</span><br><span> Libs: -L${libdir} @TALLOC_LIBS@ -losmocore</span><br><span style="color: hsl(0, 100%, 40%);">-Cflags: -I${includedir}/ @TALLOC_CFLAGS@</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+Libs.private: @PTHREAD_LIBS@</span><br><span style="color: hsl(120, 100%, 40%);">+Cflags: -I${includedir}/ @TALLOC_CFLAGS@ @PTHREAD_CFLAGS@</span><br><span>diff --git a/m4/ax_pthread.m4 b/m4/ax_pthread.m4</span><br><span>new file mode 100644</span><br><span>index 0000000..4920e07</span><br><span>--- /dev/null</span><br><span>+++ b/m4/ax_pthread.m4</span><br><span>@@ -0,0 +1,486 @@</span><br><span style="color: hsl(120, 100%, 40%);">+# ===========================================================================</span><br><span style="color: hsl(120, 100%, 40%);">+# https://www.gnu.org/software/autoconf-archive/ax_pthread.html</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%);">+# SYNOPSIS</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# DESCRIPTION</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# This macro figures out how to build C programs using POSIX threads. It</span><br><span style="color: hsl(120, 100%, 40%);">+# sets the PTHREAD_LIBS output variable to the threads library and linker</span><br><span style="color: hsl(120, 100%, 40%);">+# flags, and the PTHREAD_CFLAGS output variable to any special C compiler</span><br><span style="color: hsl(120, 100%, 40%);">+# flags that are needed. (The user can also force certain compiler</span><br><span style="color: hsl(120, 100%, 40%);">+# flags/libs to be tested by setting these environment variables.)</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# Also sets PTHREAD_CC to any special C compiler that is needed for</span><br><span style="color: hsl(120, 100%, 40%);">+# multi-threaded programs (defaults to the value of CC otherwise). (This</span><br><span style="color: hsl(120, 100%, 40%);">+# is necessary on AIX to use the special cc_r compiler alias.)</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# NOTE: You are assumed to not only compile your program with these flags,</span><br><span style="color: hsl(120, 100%, 40%);">+# but also to link with them as well. For example, you might link with</span><br><span style="color: hsl(120, 100%, 40%);">+# $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# If you are only building threaded programs, you may wish to use these</span><br><span style="color: hsl(120, 100%, 40%);">+# variables in your default LIBS, CFLAGS, and CC:</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# LIBS="$PTHREAD_LIBS $LIBS"</span><br><span style="color: hsl(120, 100%, 40%);">+# CFLAGS="$CFLAGS $PTHREAD_CFLAGS"</span><br><span style="color: hsl(120, 100%, 40%);">+# CC="$PTHREAD_CC"</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant</span><br><span style="color: hsl(120, 100%, 40%);">+# has a nonstandard name, this macro defines PTHREAD_CREATE_JOINABLE to</span><br><span style="color: hsl(120, 100%, 40%);">+# that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the</span><br><span style="color: hsl(120, 100%, 40%);">+# PTHREAD_PRIO_INHERIT symbol is defined when compiling with</span><br><span style="color: hsl(120, 100%, 40%);">+# PTHREAD_CFLAGS.</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# ACTION-IF-FOUND is a list of shell commands to run if a threads library</span><br><span style="color: hsl(120, 100%, 40%);">+# is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it</span><br><span style="color: hsl(120, 100%, 40%);">+# is not found. If ACTION-IF-FOUND is not specified, the default action</span><br><span style="color: hsl(120, 100%, 40%);">+# will define HAVE_PTHREAD.</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# Please let the authors know if this macro fails on any platform, or if</span><br><span style="color: hsl(120, 100%, 40%);">+# you have any other suggestions or comments. This macro was based on work</span><br><span style="color: hsl(120, 100%, 40%);">+# by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help</span><br><span style="color: hsl(120, 100%, 40%);">+# from M. Frigo), as well as ac_pthread and hb_pthread macros posted by</span><br><span style="color: hsl(120, 100%, 40%);">+# Alejandro Forero Cuervo to the autoconf macro repository. We are also</span><br><span style="color: hsl(120, 100%, 40%);">+# grateful for the helpful feedback of numerous users.</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# Updated for Autoconf 2.68 by Daniel Richard G.</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# LICENSE</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu></span><br><span style="color: hsl(120, 100%, 40%);">+# Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG></span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# This program is free software: you can redistribute it and/or modify it</span><br><span style="color: hsl(120, 100%, 40%);">+# under the terms of the GNU General Public License as published by the</span><br><span style="color: hsl(120, 100%, 40%);">+# Free Software Foundation, either version 3 of the License, or (at your</span><br><span style="color: hsl(120, 100%, 40%);">+# option) any later version.</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# This program is distributed in the hope that it will be useful, but</span><br><span style="color: hsl(120, 100%, 40%);">+# WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General</span><br><span style="color: hsl(120, 100%, 40%);">+# Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# You should have received a copy of the GNU General Public License along</span><br><span style="color: hsl(120, 100%, 40%);">+# with this program. If not, see <https://www.gnu.org/licenses/>.</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# As a special exception, the respective Autoconf Macro's copyright owner</span><br><span style="color: hsl(120, 100%, 40%);">+# gives unlimited permission to copy, distribute and modify the configure</span><br><span style="color: hsl(120, 100%, 40%);">+# scripts that are the output of Autoconf when processing the Macro. You</span><br><span style="color: hsl(120, 100%, 40%);">+# need not follow the terms of the GNU General Public License when using</span><br><span style="color: hsl(120, 100%, 40%);">+# or distributing such scripts, even though portions of the text of the</span><br><span style="color: hsl(120, 100%, 40%);">+# Macro appear in them. The GNU General Public License (GPL) does govern</span><br><span style="color: hsl(120, 100%, 40%);">+# all other use of the material that constitutes the Autoconf Macro.</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# This special exception to the GPL applies to versions of the Autoconf</span><br><span style="color: hsl(120, 100%, 40%);">+# Macro released by the Autoconf Archive. When you make and distribute a</span><br><span style="color: hsl(120, 100%, 40%);">+# modified version of the Autoconf Macro, you may extend this special</span><br><span style="color: hsl(120, 100%, 40%);">+# exception to the GPL to apply to your modified version as well.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#serial 25</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])</span><br><span style="color: hsl(120, 100%, 40%);">+AC_DEFUN([AX_PTHREAD], [</span><br><span style="color: hsl(120, 100%, 40%);">+AC_REQUIRE([AC_CANONICAL_HOST])</span><br><span style="color: hsl(120, 100%, 40%);">+AC_REQUIRE([AC_PROG_CC])</span><br><span style="color: hsl(120, 100%, 40%);">+AC_REQUIRE([AC_PROG_SED])</span><br><span style="color: hsl(120, 100%, 40%);">+AC_LANG_PUSH([C])</span><br><span style="color: hsl(120, 100%, 40%);">+ax_pthread_ok=no</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# We used to check for pthread.h first, but this fails if pthread.h</span><br><span style="color: hsl(120, 100%, 40%);">+# requires special compiler flags (e.g. on Tru64 or Sequent).</span><br><span style="color: hsl(120, 100%, 40%);">+# It gets checked for in the link test anyway.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# First of all, check if the user has set any of the PTHREAD_LIBS,</span><br><span style="color: hsl(120, 100%, 40%);">+# etcetera environment variables, and if threads linking works using</span><br><span style="color: hsl(120, 100%, 40%);">+# them:</span><br><span style="color: hsl(120, 100%, 40%);">+if test "x$PTHREAD_CFLAGS$PTHREAD_LIBS" != "x"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ ax_pthread_save_CC="$CC"</span><br><span style="color: hsl(120, 100%, 40%);">+ ax_pthread_save_CFLAGS="$CFLAGS"</span><br><span style="color: hsl(120, 100%, 40%);">+ ax_pthread_save_LIBS="$LIBS"</span><br><span style="color: hsl(120, 100%, 40%);">+ AS_IF([test "x$PTHREAD_CC" != "x"], [CC="$PTHREAD_CC"])</span><br><span style="color: hsl(120, 100%, 40%);">+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"</span><br><span style="color: hsl(120, 100%, 40%);">+ LIBS="$PTHREAD_LIBS $LIBS"</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_MSG_CHECKING([for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS])</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_LINK_IFELSE([AC_LANG_CALL([], [pthread_join])], [ax_pthread_ok=yes])</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_MSG_RESULT([$ax_pthread_ok])</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "x$ax_pthread_ok" = "xno"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ PTHREAD_LIBS=""</span><br><span style="color: hsl(120, 100%, 40%);">+ PTHREAD_CFLAGS=""</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ CC="$ax_pthread_save_CC"</span><br><span style="color: hsl(120, 100%, 40%);">+ CFLAGS="$ax_pthread_save_CFLAGS"</span><br><span style="color: hsl(120, 100%, 40%);">+ LIBS="$ax_pthread_save_LIBS"</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# We must check for the threads library under a number of different</span><br><span style="color: hsl(120, 100%, 40%);">+# names; the ordering is very important because some systems</span><br><span style="color: hsl(120, 100%, 40%);">+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the</span><br><span style="color: hsl(120, 100%, 40%);">+# libraries is broken (non-POSIX).</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Create a list of thread flags to try. Items starting with a "-" are</span><br><span style="color: hsl(120, 100%, 40%);">+# C compiler flags, and other items are library names, except for "none"</span><br><span style="color: hsl(120, 100%, 40%);">+# which indicates that we try without any flags at all, and "pthread-config"</span><br><span style="color: hsl(120, 100%, 40%);">+# which is a program returning the flags for the Pth emulation library.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# The ordering *is* (sometimes) important. Some notes on the</span><br><span style="color: hsl(120, 100%, 40%);">+# individual items follow:</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# pthreads: AIX (must check this before -lpthread)</span><br><span style="color: hsl(120, 100%, 40%);">+# none: in case threads are in libc; should be tried before -Kthread and</span><br><span style="color: hsl(120, 100%, 40%);">+# other compiler flags to prevent continual compiler warnings</span><br><span style="color: hsl(120, 100%, 40%);">+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)</span><br><span style="color: hsl(120, 100%, 40%);">+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads), Tru64</span><br><span style="color: hsl(120, 100%, 40%);">+# (Note: HP C rejects this with "bad form for `-t' option")</span><br><span style="color: hsl(120, 100%, 40%);">+# -pthreads: Solaris/gcc (Note: HP C also rejects)</span><br><span style="color: hsl(120, 100%, 40%);">+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it</span><br><span style="color: hsl(120, 100%, 40%);">+# doesn't hurt to check since this sometimes defines pthreads and</span><br><span style="color: hsl(120, 100%, 40%);">+# -D_REENTRANT too), HP C (must be checked before -lpthread, which</span><br><span style="color: hsl(120, 100%, 40%);">+# is present but should not be used directly; and before -mthreads,</span><br><span style="color: hsl(120, 100%, 40%);">+# because the compiler interprets this as "-mt" + "-hreads")</span><br><span style="color: hsl(120, 100%, 40%);">+# -mthreads: Mingw32/gcc, Lynx/gcc</span><br><span style="color: hsl(120, 100%, 40%);">+# pthread: Linux, etcetera</span><br><span style="color: hsl(120, 100%, 40%);">+# --thread-safe: KAI C++</span><br><span style="color: hsl(120, 100%, 40%);">+# pthread-config: use pthread-config program (for GNU Pth library)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+case $host_os in</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ freebsd*)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)</span><br><span style="color: hsl(120, 100%, 40%);">+ # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ax_pthread_flags="-kthread lthread $ax_pthread_flags"</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%);">+ hpux*)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # From the cc(1) man page: "[-mt] Sets various -D flags to enable</span><br><span style="color: hsl(120, 100%, 40%);">+ # multi-threading and also sets -lpthread."</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags"</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%);">+ openedition*)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # IBM z/OS requires a feature-test macro to be defined in order to</span><br><span style="color: hsl(120, 100%, 40%);">+ # enable POSIX threads at all, so give the user a hint if this is</span><br><span style="color: hsl(120, 100%, 40%);">+ # not set. (We don't define these ourselves, as they can affect</span><br><span style="color: hsl(120, 100%, 40%);">+ # other portions of the system API in unpredictable ways.)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_EGREP_CPP([AX_PTHREAD_ZOS_MISSING],</span><br><span style="color: hsl(120, 100%, 40%);">+ [</span><br><span style="color: hsl(120, 100%, 40%);">+# if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS)</span><br><span style="color: hsl(120, 100%, 40%);">+ AX_PTHREAD_ZOS_MISSING</span><br><span style="color: hsl(120, 100%, 40%);">+# endif</span><br><span style="color: hsl(120, 100%, 40%);">+ ],</span><br><span style="color: hsl(120, 100%, 40%);">+ [AC_MSG_WARN([IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support.])])</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%);">+ solaris*)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # On Solaris (at least, for some versions), libc contains stubbed</span><br><span style="color: hsl(120, 100%, 40%);">+ # (non-functional) versions of the pthreads routines, so link-based</span><br><span style="color: hsl(120, 100%, 40%);">+ # tests will erroneously succeed. (N.B.: The stubs are missing</span><br><span style="color: hsl(120, 100%, 40%);">+ # pthread_cleanup_push, or rather a function called by this macro,</span><br><span style="color: hsl(120, 100%, 40%);">+ # so we could check for that, but who knows whether they'll stub</span><br><span style="color: hsl(120, 100%, 40%);">+ # that too in a future libc.) So we'll check first for the</span><br><span style="color: hsl(120, 100%, 40%);">+ # standard Solaris way of linking pthreads (-mt -lpthread).</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ax_pthread_flags="-mt,pthread pthread $ax_pthread_flags"</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+esac</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+AS_IF([test "x$GCC" = "xyes"],</span><br><span style="color: hsl(120, 100%, 40%);">+ [ax_pthread_flags="-pthread -pthreads $ax_pthread_flags"])</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# The presence of a feature test macro requesting re-entrant function</span><br><span style="color: hsl(120, 100%, 40%);">+# definitions is, on some systems, a strong hint that pthreads support is</span><br><span style="color: hsl(120, 100%, 40%);">+# correctly enabled</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+case $host_os in</span><br><span style="color: hsl(120, 100%, 40%);">+ darwin* | hpux* | linux* | osf* | solaris*)</span><br><span style="color: hsl(120, 100%, 40%);">+ ax_pthread_check_macro="_REENTRANT"</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%);">+ aix*)</span><br><span style="color: hsl(120, 100%, 40%);">+ ax_pthread_check_macro="_THREAD_SAFE"</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 style="color: hsl(120, 100%, 40%);">+ ax_pthread_check_macro="--"</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+esac</span><br><span style="color: hsl(120, 100%, 40%);">+AS_IF([test "x$ax_pthread_check_macro" = "x--"],</span><br><span style="color: hsl(120, 100%, 40%);">+ [ax_pthread_check_cond=0],</span><br><span style="color: hsl(120, 100%, 40%);">+ [ax_pthread_check_cond="!defined($ax_pthread_check_macro)"])</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Are we compiling with Clang?</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+AC_CACHE_CHECK([whether $CC is Clang],</span><br><span style="color: hsl(120, 100%, 40%);">+ [ax_cv_PTHREAD_CLANG],</span><br><span style="color: hsl(120, 100%, 40%);">+ [ax_cv_PTHREAD_CLANG=no</span><br><span style="color: hsl(120, 100%, 40%);">+ # Note that Autoconf sets GCC=yes for Clang as well as GCC</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "x$GCC" = "xyes"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_EGREP_CPP([AX_PTHREAD_CC_IS_CLANG],</span><br><span style="color: hsl(120, 100%, 40%);">+ [/* Note: Clang 2.7 lacks __clang_[a-z]+__ */</span><br><span style="color: hsl(120, 100%, 40%);">+# if defined(__clang__) && defined(__llvm__)</span><br><span style="color: hsl(120, 100%, 40%);">+ AX_PTHREAD_CC_IS_CLANG</span><br><span style="color: hsl(120, 100%, 40%);">+# endif</span><br><span style="color: hsl(120, 100%, 40%);">+ ],</span><br><span style="color: hsl(120, 100%, 40%);">+ [ax_cv_PTHREAD_CLANG=yes])</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ ])</span><br><span style="color: hsl(120, 100%, 40%);">+ax_pthread_clang="$ax_cv_PTHREAD_CLANG"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ax_pthread_clang_warning=no</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Clang needs special handling, because older versions handle the -pthread</span><br><span style="color: hsl(120, 100%, 40%);">+# option in a rather... idiosyncratic way</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+if test "x$ax_pthread_clang" = "xyes"; then</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Clang takes -pthread; it has never supported any other flag</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # (Note 1: This will need to be revisited if a system that Clang</span><br><span style="color: hsl(120, 100%, 40%);">+ # supports has POSIX threads in a separate library. This tends not</span><br><span style="color: hsl(120, 100%, 40%);">+ # to be the way of modern systems, but it's conceivable.)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # (Note 2: On some systems, notably Darwin, -pthread is not needed</span><br><span style="color: hsl(120, 100%, 40%);">+ # to get POSIX threads support; the API is always present and</span><br><span style="color: hsl(120, 100%, 40%);">+ # active. We could reasonably leave PTHREAD_CFLAGS empty. But</span><br><span style="color: hsl(120, 100%, 40%);">+ # -pthread does define _REENTRANT, and while the Darwin headers</span><br><span style="color: hsl(120, 100%, 40%);">+ # ignore this macro, third-party headers might not.)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ PTHREAD_CFLAGS="-pthread"</span><br><span style="color: hsl(120, 100%, 40%);">+ PTHREAD_LIBS=</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ax_pthread_ok=yes</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # However, older versions of Clang make a point of warning the user</span><br><span style="color: hsl(120, 100%, 40%);">+ # that, in an invocation where only linking and no compilation is</span><br><span style="color: hsl(120, 100%, 40%);">+ # taking place, the -pthread option has no effect ("argument unused</span><br><span style="color: hsl(120, 100%, 40%);">+ # during compilation"). They expect -pthread to be passed in only</span><br><span style="color: hsl(120, 100%, 40%);">+ # when source code is being compiled.</span><br><span style="color: hsl(120, 100%, 40%);">+ #</span><br><span style="color: hsl(120, 100%, 40%);">+ # Problem is, this is at odds with the way Automake and most other</span><br><span style="color: hsl(120, 100%, 40%);">+ # C build frameworks function, which is that the same flags used in</span><br><span style="color: hsl(120, 100%, 40%);">+ # compilation (CFLAGS) are also used in linking. Many systems</span><br><span style="color: hsl(120, 100%, 40%);">+ # supported by AX_PTHREAD require exactly this for POSIX threads</span><br><span style="color: hsl(120, 100%, 40%);">+ # support, and in fact it is often not straightforward to specify a</span><br><span style="color: hsl(120, 100%, 40%);">+ # flag that is used only in the compilation phase and not in</span><br><span style="color: hsl(120, 100%, 40%);">+ # linking. Such a scenario is extremely rare in practice.</span><br><span style="color: hsl(120, 100%, 40%);">+ #</span><br><span style="color: hsl(120, 100%, 40%);">+ # Even though use of the -pthread flag in linking would only print</span><br><span style="color: hsl(120, 100%, 40%);">+ # a warning, this can be a nuisance for well-run software projects</span><br><span style="color: hsl(120, 100%, 40%);">+ # that build with -Werror. So if the active version of Clang has</span><br><span style="color: hsl(120, 100%, 40%);">+ # this misfeature, we search for an option to squash it.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_CACHE_CHECK([whether Clang needs flag to prevent "argument unused" warning when linking with -pthread],</span><br><span style="color: hsl(120, 100%, 40%);">+ [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG],</span><br><span style="color: hsl(120, 100%, 40%);">+ [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown</span><br><span style="color: hsl(120, 100%, 40%);">+ # Create an alternate version of $ac_link that compiles and</span><br><span style="color: hsl(120, 100%, 40%);">+ # links in two steps (.c -> .o, .o -> exe) instead of one</span><br><span style="color: hsl(120, 100%, 40%);">+ # (.c -> exe), because the warning occurs only in the second</span><br><span style="color: hsl(120, 100%, 40%);">+ # step</span><br><span style="color: hsl(120, 100%, 40%);">+ ax_pthread_save_ac_link="$ac_link"</span><br><span style="color: hsl(120, 100%, 40%);">+ ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g'</span><br><span style="color: hsl(120, 100%, 40%);">+ ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"`</span><br><span style="color: hsl(120, 100%, 40%);">+ ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)"</span><br><span style="color: hsl(120, 100%, 40%);">+ ax_pthread_save_CFLAGS="$CFLAGS"</span><br><span style="color: hsl(120, 100%, 40%);">+ for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do</span><br><span style="color: hsl(120, 100%, 40%);">+ AS_IF([test "x$ax_pthread_try" = "xunknown"], [break])</span><br><span style="color: hsl(120, 100%, 40%);">+ CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS"</span><br><span style="color: hsl(120, 100%, 40%);">+ ac_link="$ax_pthread_save_ac_link"</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],</span><br><span style="color: hsl(120, 100%, 40%);">+ [ac_link="$ax_pthread_2step_ac_link"</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],</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%);">+ done</span><br><span style="color: hsl(120, 100%, 40%);">+ ac_link="$ax_pthread_save_ac_link"</span><br><span style="color: hsl(120, 100%, 40%);">+ CFLAGS="$ax_pthread_save_CFLAGS"</span><br><span style="color: hsl(120, 100%, 40%);">+ AS_IF([test "x$ax_pthread_try" = "x"], [ax_pthread_try=no])</span><br><span style="color: hsl(120, 100%, 40%);">+ ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try"</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%);">+ case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in</span><br><span style="color: hsl(120, 100%, 40%);">+ no | unknown) ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ *) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ esac</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+fi # $ax_pthread_clang = yes</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+if test "x$ax_pthread_ok" = "xno"; then</span><br><span style="color: hsl(120, 100%, 40%);">+for ax_pthread_try_flag in $ax_pthread_flags; do</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ case $ax_pthread_try_flag in</span><br><span style="color: hsl(120, 100%, 40%);">+ none)</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_MSG_CHECKING([whether pthreads work without any flags])</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%);">+ -mt,pthread)</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_MSG_CHECKING([whether pthreads work with -mt -lpthread])</span><br><span style="color: hsl(120, 100%, 40%);">+ PTHREAD_CFLAGS="-mt"</span><br><span style="color: hsl(120, 100%, 40%);">+ PTHREAD_LIBS="-lpthread"</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 style="color: hsl(120, 100%, 40%);">+ AC_MSG_CHECKING([whether pthreads work with $ax_pthread_try_flag])</span><br><span style="color: hsl(120, 100%, 40%);">+ PTHREAD_CFLAGS="$ax_pthread_try_flag"</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%);">+ pthread-config)</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])</span><br><span style="color: hsl(120, 100%, 40%);">+ AS_IF([test "x$ax_pthread_config" = "xno"], [continue])</span><br><span style="color: hsl(120, 100%, 40%);">+ PTHREAD_CFLAGS="`pthread-config --cflags`"</span><br><span style="color: hsl(120, 100%, 40%);">+ PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"</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 style="color: hsl(120, 100%, 40%);">+ AC_MSG_CHECKING([for the pthreads library -l$ax_pthread_try_flag])</span><br><span style="color: hsl(120, 100%, 40%);">+ PTHREAD_LIBS="-l$ax_pthread_try_flag"</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ esac</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ax_pthread_save_CFLAGS="$CFLAGS"</span><br><span style="color: hsl(120, 100%, 40%);">+ ax_pthread_save_LIBS="$LIBS"</span><br><span style="color: hsl(120, 100%, 40%);">+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"</span><br><span style="color: hsl(120, 100%, 40%);">+ LIBS="$PTHREAD_LIBS $LIBS"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Check for various functions. We must include pthread.h,</span><br><span style="color: hsl(120, 100%, 40%);">+ # since some functions may be macros. (On the Sequent, we</span><br><span style="color: hsl(120, 100%, 40%);">+ # need a special flag -Kthread to make this header compile.)</span><br><span style="color: hsl(120, 100%, 40%);">+ # We check for pthread_join because it is in -lpthread on IRIX</span><br><span style="color: hsl(120, 100%, 40%);">+ # while pthread_create is in libc. We check for pthread_attr_init</span><br><span style="color: hsl(120, 100%, 40%);">+ # due to DEC craziness with -lpthreads. We check for</span><br><span style="color: hsl(120, 100%, 40%);">+ # pthread_cleanup_push because it is one of the few pthread</span><br><span style="color: hsl(120, 100%, 40%);">+ # functions on Solaris that doesn't have a non-functional libc stub.</span><br><span style="color: hsl(120, 100%, 40%);">+ # We try pthread_create on general principles.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h></span><br><span style="color: hsl(120, 100%, 40%);">+# if $ax_pthread_check_cond</span><br><span style="color: hsl(120, 100%, 40%);">+# error "$ax_pthread_check_macro must be defined"</span><br><span style="color: hsl(120, 100%, 40%);">+# endif</span><br><span style="color: hsl(120, 100%, 40%);">+ static void routine(void *a) { a = 0; }</span><br><span style="color: hsl(120, 100%, 40%);">+ static void *start_routine(void *a) { return a; }],</span><br><span style="color: hsl(120, 100%, 40%);">+ [pthread_t th; pthread_attr_t attr;</span><br><span style="color: hsl(120, 100%, 40%);">+ pthread_create(&th, 0, start_routine, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ pthread_join(th, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ pthread_attr_init(&attr);</span><br><span style="color: hsl(120, 100%, 40%);">+ pthread_cleanup_push(routine, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ pthread_cleanup_pop(0) /* ; */])],</span><br><span style="color: hsl(120, 100%, 40%);">+ [ax_pthread_ok=yes],</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%);">+ CFLAGS="$ax_pthread_save_CFLAGS"</span><br><span style="color: hsl(120, 100%, 40%);">+ LIBS="$ax_pthread_save_LIBS"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_MSG_RESULT([$ax_pthread_ok])</span><br><span style="color: hsl(120, 100%, 40%);">+ AS_IF([test "x$ax_pthread_ok" = "xyes"], [break])</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ PTHREAD_LIBS=""</span><br><span style="color: hsl(120, 100%, 40%);">+ PTHREAD_CFLAGS=""</span><br><span style="color: hsl(120, 100%, 40%);">+done</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Various other checks:</span><br><span style="color: hsl(120, 100%, 40%);">+if test "x$ax_pthread_ok" = "xyes"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ ax_pthread_save_CFLAGS="$CFLAGS"</span><br><span style="color: hsl(120, 100%, 40%);">+ ax_pthread_save_LIBS="$LIBS"</span><br><span style="color: hsl(120, 100%, 40%);">+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"</span><br><span style="color: hsl(120, 100%, 40%);">+ LIBS="$PTHREAD_LIBS $LIBS"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_CACHE_CHECK([for joinable pthread attribute],</span><br><span style="color: hsl(120, 100%, 40%);">+ [ax_cv_PTHREAD_JOINABLE_ATTR],</span><br><span style="color: hsl(120, 100%, 40%);">+ [ax_cv_PTHREAD_JOINABLE_ATTR=unknown</span><br><span style="color: hsl(120, 100%, 40%);">+ for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],</span><br><span style="color: hsl(120, 100%, 40%);">+ [int attr = $ax_pthread_attr; return attr /* ; */])],</span><br><span style="color: hsl(120, 100%, 40%);">+ [ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break],</span><br><span style="color: hsl(120, 100%, 40%);">+ [])</span><br><span style="color: hsl(120, 100%, 40%);">+ done</span><br><span style="color: hsl(120, 100%, 40%);">+ ])</span><br><span style="color: hsl(120, 100%, 40%);">+ AS_IF([test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \</span><br><span style="color: hsl(120, 100%, 40%);">+ test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \</span><br><span style="color: hsl(120, 100%, 40%);">+ test "x$ax_pthread_joinable_attr_defined" != "xyes"],</span><br><span style="color: hsl(120, 100%, 40%);">+ [AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE],</span><br><span style="color: hsl(120, 100%, 40%);">+ [$ax_cv_PTHREAD_JOINABLE_ATTR],</span><br><span style="color: hsl(120, 100%, 40%);">+ [Define to necessary symbol if this constant</span><br><span style="color: hsl(120, 100%, 40%);">+ uses a non-standard name on your system.])</span><br><span style="color: hsl(120, 100%, 40%);">+ ax_pthread_joinable_attr_defined=yes</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%);">+ AC_CACHE_CHECK([whether more special flags are required for pthreads],</span><br><span style="color: hsl(120, 100%, 40%);">+ [ax_cv_PTHREAD_SPECIAL_FLAGS],</span><br><span style="color: hsl(120, 100%, 40%);">+ [ax_cv_PTHREAD_SPECIAL_FLAGS=no</span><br><span style="color: hsl(120, 100%, 40%);">+ case $host_os in</span><br><span style="color: hsl(120, 100%, 40%);">+ solaris*)</span><br><span style="color: hsl(120, 100%, 40%);">+ ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS"</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ esac</span><br><span style="color: hsl(120, 100%, 40%);">+ ])</span><br><span style="color: hsl(120, 100%, 40%);">+ AS_IF([test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \</span><br><span style="color: hsl(120, 100%, 40%);">+ test "x$ax_pthread_special_flags_added" != "xyes"],</span><br><span style="color: hsl(120, 100%, 40%);">+ [PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS"</span><br><span style="color: hsl(120, 100%, 40%);">+ ax_pthread_special_flags_added=yes])</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],</span><br><span style="color: hsl(120, 100%, 40%);">+ [ax_cv_PTHREAD_PRIO_INHERIT],</span><br><span style="color: hsl(120, 100%, 40%);">+ [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],</span><br><span style="color: hsl(120, 100%, 40%);">+ [[int i = PTHREAD_PRIO_INHERIT;</span><br><span style="color: hsl(120, 100%, 40%);">+ return i;]])],</span><br><span style="color: hsl(120, 100%, 40%);">+ [ax_cv_PTHREAD_PRIO_INHERIT=yes],</span><br><span style="color: hsl(120, 100%, 40%);">+ [ax_cv_PTHREAD_PRIO_INHERIT=no])</span><br><span style="color: hsl(120, 100%, 40%);">+ ])</span><br><span style="color: hsl(120, 100%, 40%);">+ AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \</span><br><span style="color: hsl(120, 100%, 40%);">+ test "x$ax_pthread_prio_inherit_defined" != "xyes"],</span><br><span style="color: hsl(120, 100%, 40%);">+ [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])</span><br><span style="color: hsl(120, 100%, 40%);">+ ax_pthread_prio_inherit_defined=yes</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%);">+ CFLAGS="$ax_pthread_save_CFLAGS"</span><br><span style="color: hsl(120, 100%, 40%);">+ LIBS="$ax_pthread_save_LIBS"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # More AIX lossage: compile with *_r variant</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "x$GCC" != "xyes"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ case $host_os in</span><br><span style="color: hsl(120, 100%, 40%);">+ aix*)</span><br><span style="color: hsl(120, 100%, 40%);">+ AS_CASE(["x/$CC"],</span><br><span style="color: hsl(120, 100%, 40%);">+ [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],</span><br><span style="color: hsl(120, 100%, 40%);">+ [#handle absolute path differently from PATH based program lookup</span><br><span style="color: hsl(120, 100%, 40%);">+ AS_CASE(["x$CC"],</span><br><span style="color: hsl(120, 100%, 40%);">+ [x/*],</span><br><span style="color: hsl(120, 100%, 40%);">+ [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],</span><br><span style="color: hsl(120, 100%, 40%);">+ [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ esac</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+AC_SUBST([PTHREAD_LIBS])</span><br><span style="color: hsl(120, 100%, 40%);">+AC_SUBST([PTHREAD_CFLAGS])</span><br><span style="color: hsl(120, 100%, 40%);">+AC_SUBST([PTHREAD_CC])</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:</span><br><span style="color: hsl(120, 100%, 40%);">+if test "x$ax_pthread_ok" = "xyes"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])</span><br><span style="color: hsl(120, 100%, 40%);">+ :</span><br><span style="color: hsl(120, 100%, 40%);">+else</span><br><span style="color: hsl(120, 100%, 40%);">+ ax_pthread_ok=no</span><br><span style="color: hsl(120, 100%, 40%);">+ $2</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+AC_LANG_POP</span><br><span style="color: hsl(120, 100%, 40%);">+])dnl AX_PTHREAD</span><br><span>diff --git a/src/Makefile.am b/src/Makefile.am</span><br><span>index 245eb6d..5f5f017 100644</span><br><span>--- a/src/Makefile.am</span><br><span>+++ b/src/Makefile.am</span><br><span>@@ -4,7 +4,7 @@</span><br><span> LIBVERSION=14:0:2</span><br><span> </span><br><span> AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include</span><br><span style="color: hsl(0, 100%, 40%);">-AM_CFLAGS = -Wall $(TALLOC_CFLAGS)</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS)</span><br><span> </span><br><span> if ENABLE_PSEUDOTALLOC</span><br><span> AM_CPPFLAGS += -I$(top_srcdir)/src/pseudotalloc</span><br><span>@@ -12,7 +12,7 @@</span><br><span> </span><br><span> lib_LTLIBRARIES = libosmocore.la</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-libosmocore_la_LIBADD = $(BACKTRACE_LIB) $(TALLOC_LIBS) $(LIBRARY_RT)</span><br><span style="color: hsl(120, 100%, 40%);">+libosmocore_la_LIBADD = $(BACKTRACE_LIB) $(TALLOC_LIBS) $(LIBRARY_RT) $(PTHREAD_LIBS)</span><br><span> libosmocore_la_SOURCES = context.c timer.c timer_gettimeofday.c timer_clockgettime.c \</span><br><span> select.c signal.c msgb.c bits.c \</span><br><span> bitvec.c bitcomp.c counter.c fsm.c \</span><br><span>diff --git a/src/gb/gprs_bssgp_vty.c b/src/gb/gprs_bssgp_vty.c</span><br><span>index 3af6517..5dab94e 100644</span><br><span>--- a/src/gb/gprs_bssgp_vty.c</span><br><span>+++ b/src/gb/gprs_bssgp_vty.c</span><br><span>@@ -181,21 +181,27 @@</span><br><span> "BVCI of the BVC to be filtered\n"</span><br><span> "BSSGP Virtual Connection Identifier (BVCI)\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct log_target *tgt = osmo_log_vty2tgt(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct log_target *tgt;</span><br><span> struct bssgp_bvc_ctx *bvc;</span><br><span> uint16_t nsei = atoi(argv[0]);</span><br><span> uint16_t bvci = atoi(argv[1]);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!tgt)</span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_lock();</span><br><span style="color: hsl(120, 100%, 40%);">+ tgt = osmo_log_vty2tgt(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!tgt) {</span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_unlock();</span><br><span> return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> bvc = btsctx_by_bvci_nsei(bvci, nsei);</span><br><span> if (!bvc) {</span><br><span> vty_out(vty, "No BVC by that identifier%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_unlock();</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span> log_set_bvc_filter(tgt, bvc);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_unlock();</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/gb/gprs_ns_vty.c b/src/gb/gprs_ns_vty.c</span><br><span>index 53c71a9..4a90436 100644</span><br><span>--- a/src/gb/gprs_ns_vty.c</span><br><span>+++ b/src/gb/gprs_ns_vty.c</span><br><span>@@ -587,12 +587,16 @@</span><br><span> "Identify NS-VC by NSVCI\n"</span><br><span> "Numeric identifier\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct log_target *tgt = osmo_log_vty2tgt(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct log_target *tgt;</span><br><span> struct gprs_nsvc *nsvc;</span><br><span> uint16_t id = atoi(argv[1]);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!tgt)</span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_lock();</span><br><span style="color: hsl(120, 100%, 40%);">+ tgt = osmo_log_vty2tgt(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!tgt) {</span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_unlock();</span><br><span> return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> if (!strcmp(argv[0], "nsei"))</span><br><span> nsvc = gprs_nsvc_by_nsei(vty_nsi, id);</span><br><span>@@ -601,10 +605,12 @@</span><br><span> </span><br><span> if (!nsvc) {</span><br><span> vty_out(vty, "No NS-VC by that identifier%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_unlock();</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span> log_set_nsvc_filter(tgt, nsvc);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_unlock();</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/logging.c b/src/logging.c</span><br><span>index 1c3544f..b030f8a 100644</span><br><span>--- a/src/logging.c</span><br><span>+++ b/src/logging.c</span><br><span>@@ -42,6 +42,7 @@</span><br><span> #include <time.h></span><br><span> #include <sys/time.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 <osmocom/core/talloc.h></span><br><span> #include <osmocom/core/utils.h></span><br><span>@@ -63,6 +64,56 @@</span><br><span> void *tall_log_ctx = NULL;</span><br><span> LLIST_HEAD(osmo_log_target_list);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#if (!EMBEDDED)</span><br><span style="color: hsl(120, 100%, 40%);">+/*! This mutex must be held while using osmo_log_target_list or any of its</span><br><span style="color: hsl(120, 100%, 40%);">+ log_targets in a multithread program. Prevents race conditions between threads</span><br><span style="color: hsl(120, 100%, 40%);">+ like producing unordered timestamps or VTY deleting a target while another</span><br><span style="color: hsl(120, 100%, 40%);">+ thread is writing to it */</span><br><span style="color: hsl(120, 100%, 40%);">+static pthread_mutex_t osmo_log_tgt_mutex;</span><br><span style="color: hsl(120, 100%, 40%);">+static bool osmo_log_tgt_mutex_on = false;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Enable multithread support (mutex) in libosmocore logging system.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Must be called by processes willing to use logging subsystem from several</span><br><span style="color: hsl(120, 100%, 40%);">+ * threads. Once enabled, it's not possible to disable it again.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+void log_enable_multithread(void) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_log_tgt_mutex_on)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ pthread_mutex_init(&osmo_log_tgt_mutex, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_log_tgt_mutex_on = true;</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%);">+/*! Acquire the osmo_log_tgt_mutex. Don't use this function directly, always use</span><br><span style="color: hsl(120, 100%, 40%);">+ * macro log_tgt_mutex_lock() instead.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+void log_tgt_mutex_lock_impl(void) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* These lines are useful to debug scenarios where there's only 1 thread</span><br><span style="color: hsl(120, 100%, 40%);">+ and a double lock appears, for instance during startup and some</span><br><span style="color: hsl(120, 100%, 40%);">+ unlock() missing somewhere:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_log_tgt_mutex_on && pthread_mutex_trylock(&osmo_log_tgt_mutex) != 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_panic("acquiring already locked mutex!\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</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%);">+ if (osmo_log_tgt_mutex_on)</span><br><span style="color: hsl(120, 100%, 40%);">+ pthread_mutex_lock(&osmo_log_tgt_mutex);</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%);">+/*! Release the osmo_log_tgt_mutex. Don't use this function directly, always use</span><br><span style="color: hsl(120, 100%, 40%);">+ * macro log_tgt_mutex_unlock() instead.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+void log_tgt_mutex_unlock_impl(void) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_log_tgt_mutex_on)</span><br><span style="color: hsl(120, 100%, 40%);">+ pthread_mutex_unlock(&osmo_log_tgt_mutex);</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%);">+#else /* if (!EMBEDDED) */</span><br><span style="color: hsl(120, 100%, 40%);">+#pragma message ("logging multithread support disabled in embedded build")</span><br><span style="color: hsl(120, 100%, 40%);">+void log_enable_multithread(void) {}</span><br><span style="color: hsl(120, 100%, 40%);">+void log_tgt_mutex_lock_impl(void) {}</span><br><span style="color: hsl(120, 100%, 40%);">+void log_tgt_mutex_unlock_impl(void) {}</span><br><span style="color: hsl(120, 100%, 40%);">+#endif /* if (!EMBEDDED) */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> const struct value_string loglevel_strs[] = {</span><br><span> { LOGL_DEBUG, "DEBUG" },</span><br><span> { LOGL_INFO, "INFO" },</span><br><span>@@ -532,6 +583,8 @@</span><br><span> </span><br><span> subsys = map_subsys(subsys);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_lock();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> llist_for_each_entry(tar, &osmo_log_target_list, entry) {</span><br><span> va_list bp;</span><br><span> </span><br><span>@@ -548,6 +601,8 @@</span><br><span> _output(tar, subsys, level, file, line, cont, format, bp);</span><br><span> va_end(bp);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_unlock();</span><br><span> }</span><br><span> </span><br><span> /*! logging function used by DEBUGP() macro</span><br><span>@@ -870,6 +925,7 @@</span><br><span> * \param[in] type Log target type</span><br><span> * \param[in] fname File name</span><br><span> * \returns Log target (if found), NULL otherwise</span><br><span style="color: hsl(120, 100%, 40%);">+ * Must be called with mutex osmo_log_tgt_mutex held, see log_tgt_mutex_lock.</span><br><span> */</span><br><span> struct log_target *log_target_find(int type, const char *fname)</span><br><span> {</span><br><span>@@ -942,6 +998,8 @@</span><br><span> struct log_target *tar;</span><br><span> int rc = 0;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_lock();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> llist_for_each_entry(tar, &osmo_log_target_list, entry) {</span><br><span> switch (tar->type) {</span><br><span> case LOG_TGT_TYPE_FILE:</span><br><span>@@ -953,6 +1011,8 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_unlock();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span>@@ -1015,6 +1075,8 @@</span><br><span> {</span><br><span> struct log_target *tar, *tar2;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_lock();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> llist_for_each_entry_safe(tar, tar2, &osmo_log_target_list, entry)</span><br><span> log_target_destroy(tar);</span><br><span> </span><br><span>@@ -1022,6 +1084,8 @@</span><br><span> osmo_log_info = NULL;</span><br><span> talloc_free(tall_log_ctx);</span><br><span> tall_log_ctx = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_unlock();</span><br><span> }</span><br><span> </span><br><span> /*! Check whether a log entry will be generated.</span><br><span>@@ -1036,15 +1100,19 @@</span><br><span> </span><br><span> /* TODO: The following could/should be cached (update on config) */</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_lock();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> llist_for_each_entry(tar, &osmo_log_target_list, entry) {</span><br><span> if (!should_log_to_target(tar, subsys, level))</span><br><span> continue;</span><br><span> </span><br><span> /* This might get logged (ignoring filters) */</span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_unlock();</span><br><span> return 1;</span><br><span> }</span><br><span> </span><br><span> /* We are sure, that this will not be logged. */</span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_unlock();</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c</span><br><span>index d639a8f..88ee330 100644</span><br><span>--- a/src/vty/logging_vty.c</span><br><span>+++ b/src/vty/logging_vty.c</span><br><span>@@ -101,6 +101,25 @@</span><br><span> return target;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! Get tgt with log lock acquired, return and release lock with warning if tgt</span><br><span style="color: hsl(120, 100%, 40%);">+ * is not found. Lock must be released later with log_tgt_mutex_unlock().</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+#define ACQUIRE_VTY_LOG_TGT_WITH_LOCK(vty, tgt) \</span><br><span style="color: hsl(120, 100%, 40%);">+ do { \</span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_lock(); \</span><br><span style="color: hsl(120, 100%, 40%);">+ tgt = osmo_log_vty2tgt(vty); \</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!(tgt)) { \</span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_unlock(); \</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING; \</span><br><span style="color: hsl(120, 100%, 40%);">+ } \</span><br><span style="color: hsl(120, 100%, 40%);">+ } while (0)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define RET_WITH_UNLOCK(ret) \</span><br><span style="color: hsl(120, 100%, 40%);">+ do { \</span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_unlock(); \</span><br><span style="color: hsl(120, 100%, 40%);">+ return (ret); \</span><br><span style="color: hsl(120, 100%, 40%);">+ } while (0)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> DEFUN(enable_logging,</span><br><span> enable_logging_cmd,</span><br><span> "logging enable",</span><br><span>@@ -118,11 +137,16 @@</span><br><span> conn->dbg = log_target_create_vty(vty);</span><br><span> if (!conn->dbg)</span><br><span> return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_lock();</span><br><span> log_add_target(conn->dbg);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_SUCCESS);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! Get log target associated to VTY console.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] vty Log target type</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns Log target (if logging enabled), NULL otherwise</span><br><span style="color: hsl(120, 100%, 40%);">+ * Must be called with mutex osmo_log_tgt_mutex held, see log_tgt_mutex_lock.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span> struct log_target *osmo_log_vty2tgt(struct vty *vty)</span><br><span> {</span><br><span> struct telnet_connection *conn;</span><br><span>@@ -146,13 +170,12 @@</span><br><span> "Only print messages matched by other filters\n"</span><br><span> "Bypass filter and print all messages\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct log_target *tgt = osmo_log_vty2tgt(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct log_target *tgt;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!tgt)</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ ACQUIRE_VTY_LOG_TGT_WITH_LOCK(vty, tgt);</span><br><span> </span><br><span> log_set_all_filter(tgt, atoi(argv[0]));</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_SUCCESS);</span><br><span> }</span><br><span> </span><br><span> DEFUN(logging_use_clr,</span><br><span>@@ -162,13 +185,12 @@</span><br><span> "Don't use color for printing messages\n"</span><br><span> "Use color for printing messages\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct log_target *tgt = osmo_log_vty2tgt(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct log_target *tgt;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!tgt)</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ ACQUIRE_VTY_LOG_TGT_WITH_LOCK(vty, tgt);</span><br><span> </span><br><span> log_set_use_color(tgt, atoi(argv[0]));</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_SUCCESS);</span><br><span> }</span><br><span> </span><br><span> DEFUN(logging_prnt_timestamp,</span><br><span>@@ -178,13 +200,12 @@</span><br><span> "Don't prefix each log message\n"</span><br><span> "Prefix each log message with current timestamp\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct log_target *tgt = osmo_log_vty2tgt(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct log_target *tgt;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!tgt)</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ ACQUIRE_VTY_LOG_TGT_WITH_LOCK(vty, tgt);</span><br><span> </span><br><span> log_set_print_timestamp(tgt, atoi(argv[0]));</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_SUCCESS);</span><br><span> }</span><br><span> </span><br><span> DEFUN(logging_prnt_ext_timestamp,</span><br><span>@@ -195,13 +216,12 @@</span><br><span> "Don't prefix each log message\n"</span><br><span> "Prefix each log message with current timestamp with YYYYMMDDhhmmssnnn\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct log_target *tgt = osmo_log_vty2tgt(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct log_target *tgt;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!tgt)</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ ACQUIRE_VTY_LOG_TGT_WITH_LOCK(vty, tgt);</span><br><span> </span><br><span> log_set_print_extended_timestamp(tgt, atoi(argv[0]));</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_SUCCESS);</span><br><span> }</span><br><span> </span><br><span> DEFUN(logging_prnt_cat,</span><br><span>@@ -212,13 +232,11 @@</span><br><span> "Don't prefix each log message\n"</span><br><span> "Prefix each log message with category/subsystem name\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct log_target *tgt = osmo_log_vty2tgt(vty);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!tgt)</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct log_target *tgt;</span><br><span style="color: hsl(120, 100%, 40%);">+ ACQUIRE_VTY_LOG_TGT_WITH_LOCK(vty, tgt);</span><br><span> </span><br><span> log_set_print_category(tgt, atoi(argv[0]));</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_SUCCESS);</span><br><span> }</span><br><span> </span><br><span> DEFUN(logging_prnt_cat_hex,</span><br><span>@@ -229,13 +247,12 @@</span><br><span> "Don't prefix each log message\n"</span><br><span> "Prefix each log message with category/subsystem nr in hex ('<000b>')\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct log_target *tgt = osmo_log_vty2tgt(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct log_target *tgt;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!tgt)</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ ACQUIRE_VTY_LOG_TGT_WITH_LOCK(vty, tgt);</span><br><span> </span><br><span> log_set_print_category_hex(tgt, atoi(argv[0]));</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_SUCCESS);</span><br><span> }</span><br><span> </span><br><span> DEFUN(logging_prnt_level,</span><br><span>@@ -246,13 +263,12 @@</span><br><span> "Don't prefix each log message\n"</span><br><span> "Prefix each log message with the log level name\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct log_target *tgt = osmo_log_vty2tgt(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct log_target *tgt;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!tgt)</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ ACQUIRE_VTY_LOG_TGT_WITH_LOCK(vty, tgt);</span><br><span> </span><br><span> log_set_print_level(tgt, atoi(argv[0]));</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_SUCCESS);</span><br><span> }</span><br><span> </span><br><span> static const struct value_string logging_print_file_args[] = {</span><br><span>@@ -273,17 +289,16 @@</span><br><span> "Log source file info at the end of a log line. If omitted, log source file info just"</span><br><span> " before the log text.\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct log_target *tgt = osmo_log_vty2tgt(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct log_target *tgt;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!tgt)</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ ACQUIRE_VTY_LOG_TGT_WITH_LOCK(vty, tgt);</span><br><span> </span><br><span> log_set_print_filename2(tgt, get_string_value(logging_print_file_args, argv[0]));</span><br><span> if (argc > 1)</span><br><span> log_set_print_filename_pos(tgt, LOG_FILENAME_POS_LINE_END);</span><br><span> else</span><br><span> log_set_print_filename_pos(tgt, LOG_FILENAME_POS_HEADER_END);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_SUCCESS);</span><br><span> }</span><br><span> </span><br><span> static void add_category_strings(char **cmd_str_p, char **doc_str_p,</span><br><span>@@ -332,27 +347,26 @@</span><br><span> NULL, /* cmdstr is dynamically set in logging_vty_add_cmds(). */</span><br><span> NULL) /* same thing for helpstr. */</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct log_target *tgt;</span><br><span> int category = log_parse_category(argv[0]);</span><br><span> int level = log_parse_level(argv[1]);</span><br><span style="color: hsl(0, 100%, 40%);">- struct log_target *tgt = osmo_log_vty2tgt(vty);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!tgt)</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ ACQUIRE_VTY_LOG_TGT_WITH_LOCK(vty, tgt);</span><br><span> </span><br><span> if (level < 0) {</span><br><span> vty_out(vty, "Invalid level `%s'%s", argv[1], VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_WARNING);</span><br><span> }</span><br><span> </span><br><span> if (category < 0) {</span><br><span> vty_out(vty, "Invalid category `%s'%s", argv[0], VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_WARNING);</span><br><span> }</span><br><span> </span><br><span> tgt->categories[category].enabled = 1;</span><br><span> tgt->categories[category].loglevel = level;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_SUCCESS);</span><br><span> }</span><br><span> </span><br><span> DEFUN(logging_level_set_all, logging_level_set_all_cmd,</span><br><span>@@ -362,12 +376,11 @@</span><br><span> " to take back these changes -- each category is set to the given level, period.\n"</span><br><span> LOG_LEVEL_STRS)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct log_target *tgt = osmo_log_vty2tgt(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct log_target *tgt;</span><br><span> int level = log_parse_level(argv[0]);</span><br><span> int i;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!tgt)</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ ACQUIRE_VTY_LOG_TGT_WITH_LOCK(vty, tgt);</span><br><span> </span><br><span> for (i = 0; i < osmo_log_info->num_cat; i++) {</span><br><span> struct log_category *cat = &tgt->categories[i];</span><br><span>@@ -378,7 +391,7 @@</span><br><span> cat->enabled = 1;</span><br><span> cat->loglevel = level;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_SUCCESS);</span><br><span> }</span><br><span> </span><br><span> /* logging level (<categories>) everything */</span><br><span>@@ -394,23 +407,25 @@</span><br><span> "logging level force-all " LOG_LEVEL_ARGS,</span><br><span> LOGGING_STR LEVEL_STR FORCE_ALL_STR LOG_LEVEL_STRS)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct log_target *tgt = osmo_log_vty2tgt(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct log_target *tgt;</span><br><span> int level = log_parse_level(argv[0]);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!tgt)</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ACQUIRE_VTY_LOG_TGT_WITH_LOCK(vty, tgt);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> log_set_log_level(tgt, level);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_SUCCESS);</span><br><span> }</span><br><span> </span><br><span> DEFUN(no_logging_level_force_all, no_logging_level_force_all_cmd,</span><br><span> "no logging level force-all",</span><br><span> NO_STR LOGGING_STR LEVEL_STR NO_FORCE_ALL_STR)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct log_target *tgt = osmo_log_vty2tgt(vty);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!tgt)</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct log_target *tgt;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ACQUIRE_VTY_LOG_TGT_WITH_LOCK(vty, tgt);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> log_set_log_level(tgt, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_SUCCESS);</span><br><span> }</span><br><span> </span><br><span> /* 'logging level all (debug|...|fatal)' */</span><br><span>@@ -438,13 +453,12 @@</span><br><span> " " OSMO_STRINGIFY(LOGL_FATAL) "=" OSMO_STRINGIFY_VAL(LOGL_FATAL)</span><br><span> "\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct log_target *tgt = osmo_log_vty2tgt(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct log_target *tgt;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!tgt)</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ ACQUIRE_VTY_LOG_TGT_WITH_LOCK(vty, tgt);</span><br><span> </span><br><span> log_parse_category_mask(tgt, argv[0]);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_SUCCESS);</span><br><span> }</span><br><span> </span><br><span> ALIAS_DEPRECATED(logging_set_category_mask,</span><br><span>@@ -462,17 +476,16 @@</span><br><span> LOGGING_STR</span><br><span> "Disables logging to this vty\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct log_target *tgt = osmo_log_vty2tgt(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct log_target *tgt;</span><br><span> struct telnet_connection *conn = (struct telnet_connection *) vty->priv;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!tgt)</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ ACQUIRE_VTY_LOG_TGT_WITH_LOCK(vty, tgt);</span><br><span> </span><br><span> log_del_target(tgt);</span><br><span> talloc_free(tgt);</span><br><span> conn->dbg = NULL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_SUCCESS);</span><br><span> }</span><br><span> </span><br><span> static void vty_print_logtarget(struct vty *vty, const struct log_info *info,</span><br><span>@@ -517,14 +530,12 @@</span><br><span> SHOW_STR SHOW_LOG_STR</span><br><span> "Show current logging configuration for this vty\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct log_target *tgt = osmo_log_vty2tgt(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct log_target *tgt;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!tgt)</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ ACQUIRE_VTY_LOG_TGT_WITH_LOCK(vty, tgt);</span><br><span> </span><br><span> vty_print_logtarget(vty, osmo_log_info, tgt);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_SUCCESS);</span><br><span> }</span><br><span> </span><br><span> DEFUN(show_alarms,</span><br><span>@@ -535,11 +546,14 @@</span><br><span> {</span><br><span> int i, num_alarms;</span><br><span> struct osmo_strrb *rb;</span><br><span style="color: hsl(0, 100%, 40%);">- struct log_target *tgt = log_target_find(LOG_TGT_TYPE_STRRB, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct log_target *tgt;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_lock();</span><br><span style="color: hsl(120, 100%, 40%);">+ tgt = log_target_find(LOG_TGT_TYPE_STRRB, NULL);</span><br><span> if (!tgt) {</span><br><span> vty_out(vty, "%% No alarms, run 'log alarms <2-32700>'%s",</span><br><span> VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_WARNING);</span><br><span> }</span><br><span> </span><br><span> rb = tgt->tgt_rb.rb;</span><br><span>@@ -550,8 +564,7 @@</span><br><span> for (i = 0; i < num_alarms; i++)</span><br><span> vty_out(vty, "%% %s%s", osmo_strrb_get_nth(rb, i),</span><br><span> VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_SUCCESS);</span><br><span> }</span><br><span> </span><br><span> gDEFUN(cfg_description, cfg_description_cmd,</span><br><span>@@ -625,6 +638,7 @@</span><br><span> {</span><br><span> struct log_target *tgt;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_lock();</span><br><span> /* First delete the old syslog target, if any */</span><br><span> tgt = log_target_find(LOG_TGT_TYPE_SYSLOG, NULL);</span><br><span> if (tgt)</span><br><span>@@ -633,14 +647,14 @@</span><br><span> tgt = log_target_create_syslog(host.app_info->name, 0, facility);</span><br><span> if (!tgt) {</span><br><span> vty_out(vty, "%% Unable to open syslog%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_WARNING);</span><br><span> }</span><br><span> log_add_target(tgt);</span><br><span> </span><br><span> vty->index = tgt;</span><br><span> vty->node = CFG_LOG_NODE;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_SUCCESS);</span><br><span> }</span><br><span> </span><br><span> DEFUN(cfg_log_syslog_local, cfg_log_syslog_local_cmd,</span><br><span>@@ -700,16 +714,17 @@</span><br><span> {</span><br><span> struct log_target *tgt;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_lock();</span><br><span> tgt = log_target_find(LOG_TGT_TYPE_SYSLOG, NULL);</span><br><span> if (!tgt) {</span><br><span> vty_out(vty, "%% No syslog target found%s",</span><br><span> VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_WARNING);</span><br><span> }</span><br><span> </span><br><span> log_target_destroy(tgt);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_SUCCESS);</span><br><span> }</span><br><span> #endif /* HAVE_SYSLOG_H */</span><br><span> </span><br><span>@@ -721,6 +736,7 @@</span><br><span> const char *hostname = argc ? argv[0] : "127.0.0.1";</span><br><span> struct log_target *tgt;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_lock();</span><br><span> tgt = log_target_find(LOG_TGT_TYPE_GSMTAP, hostname);</span><br><span> if (!tgt) {</span><br><span> tgt = log_target_create_gsmtap(hostname, GSMTAP_UDP_PORT,</span><br><span>@@ -729,7 +745,7 @@</span><br><span> if (!tgt) {</span><br><span> vty_out(vty, "%% Unable to create GSMTAP log for %s%s",</span><br><span> hostname, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_WARNING);</span><br><span> }</span><br><span> log_add_target(tgt);</span><br><span> }</span><br><span>@@ -737,7 +753,7 @@</span><br><span> vty->index = tgt;</span><br><span> vty->node = CFG_LOG_NODE;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_SUCCESS);</span><br><span> }</span><br><span> </span><br><span> DEFUN(cfg_log_stderr, cfg_log_stderr_cmd,</span><br><span>@@ -746,13 +762,14 @@</span><br><span> {</span><br><span> struct log_target *tgt;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_lock();</span><br><span> tgt = log_target_find(LOG_TGT_TYPE_STDERR, NULL);</span><br><span> if (!tgt) {</span><br><span> tgt = log_target_create_stderr();</span><br><span> if (!tgt) {</span><br><span> vty_out(vty, "%% Unable to create stderr log%s",</span><br><span> VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_WARNING);</span><br><span> }</span><br><span> log_add_target(tgt);</span><br><span> }</span><br><span>@@ -760,7 +777,7 @@</span><br><span> vty->index = tgt;</span><br><span> vty->node = CFG_LOG_NODE;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_SUCCESS);</span><br><span> }</span><br><span> </span><br><span> DEFUN(cfg_no_log_stderr, cfg_no_log_stderr_cmd,</span><br><span>@@ -769,15 +786,16 @@</span><br><span> {</span><br><span> struct log_target *tgt;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_lock();</span><br><span> tgt = log_target_find(LOG_TGT_TYPE_STDERR, NULL);</span><br><span> if (!tgt) {</span><br><span> vty_out(vty, "%% No stderr logging active%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_WARNING);</span><br><span> }</span><br><span> </span><br><span> log_target_destroy(tgt);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_SUCCESS);</span><br><span> }</span><br><span> </span><br><span> DEFUN(cfg_log_file, cfg_log_file_cmd,</span><br><span>@@ -787,13 +805,14 @@</span><br><span> const char *fname = argv[0];</span><br><span> struct log_target *tgt;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_lock();</span><br><span> tgt = log_target_find(LOG_TGT_TYPE_FILE, fname);</span><br><span> if (!tgt) {</span><br><span> tgt = log_target_create_file(fname);</span><br><span> if (!tgt) {</span><br><span> vty_out(vty, "%% Unable to create file `%s'%s",</span><br><span> fname, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_WARNING);</span><br><span> }</span><br><span> log_add_target(tgt);</span><br><span> }</span><br><span>@@ -801,7 +820,7 @@</span><br><span> vty->index = tgt;</span><br><span> vty->node = CFG_LOG_NODE;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_SUCCESS);</span><br><span> }</span><br><span> </span><br><span> </span><br><span>@@ -812,16 +831,17 @@</span><br><span> const char *fname = argv[0];</span><br><span> struct log_target *tgt;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_lock();</span><br><span> tgt = log_target_find(LOG_TGT_TYPE_FILE, fname);</span><br><span> if (!tgt) {</span><br><span> vty_out(vty, "%% No such log file `%s'%s",</span><br><span> fname, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_WARNING);</span><br><span> }</span><br><span> </span><br><span> log_target_destroy(tgt);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_SUCCESS);</span><br><span> }</span><br><span> </span><br><span> DEFUN(cfg_log_alarms, cfg_log_alarms_cmd,</span><br><span>@@ -832,6 +852,8 @@</span><br><span> struct log_target *tgt;</span><br><span> unsigned int rbsize = atoi(argv[0]);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_lock();</span><br><span> tgt = log_target_find(LOG_TGT_TYPE_STRRB, NULL);</span><br><span> if (tgt)</span><br><span> log_target_destroy(tgt);</span><br><span>@@ -840,14 +862,14 @@</span><br><span> if (!tgt) {</span><br><span> vty_out(vty, "%% Unable to create osmo_strrb (size %u)%s",</span><br><span> rbsize, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_WARNING);</span><br><span> }</span><br><span> log_add_target(tgt);</span><br><span> </span><br><span> vty->index = tgt;</span><br><span> vty->node = CFG_LOG_NODE;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_SUCCESS);</span><br><span> }</span><br><span> </span><br><span> DEFUN(cfg_no_log_alarms, cfg_no_log_alarms_cmd,</span><br><span>@@ -856,15 +878,16 @@</span><br><span> {</span><br><span> struct log_target *tgt;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_lock();</span><br><span> tgt = log_target_find(LOG_TGT_TYPE_STRRB, NULL);</span><br><span> if (!tgt) {</span><br><span> vty_out(vty, "%% No osmo_strrb target found%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_WARNING);</span><br><span> }</span><br><span> </span><br><span> log_target_destroy(tgt);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ RET_WITH_UNLOCK(CMD_SUCCESS);</span><br><span> }</span><br><span> </span><br><span> static int config_write_log_single(struct vty *vty, struct log_target *tgt)</span><br><span>@@ -962,11 +985,13 @@</span><br><span> </span><br><span> static int config_write_log(struct vty *vty)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_lock();</span><br><span> struct log_target *dbg = vty->index;</span><br><span> </span><br><span> llist_for_each_entry(dbg, &osmo_log_target_list, entry)</span><br><span> config_write_log_single(vty, dbg);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_unlock();</span><br><span> return 1;</span><br><span> }</span><br><span> </span><br><span>diff --git a/tests/Makefile.am b/tests/Makefile.am</span><br><span>index ececf69..e0993b1 100644</span><br><span>--- a/tests/Makefile.am</span><br><span>+++ b/tests/Makefile.am</span><br><span>@@ -1,7 +1,7 @@</span><br><span> AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include</span><br><span style="color: hsl(0, 100%, 40%);">-AM_CFLAGS = -Wall $(TALLOC_CFLAGS)</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS)</span><br><span> AM_LDFLAGS = -no-install</span><br><span style="color: hsl(0, 100%, 40%);">-LDADD = $(top_builddir)/src/libosmocore.la $(TALLOC_LIBS)</span><br><span style="color: hsl(120, 100%, 40%);">+LDADD = $(top_builddir)/src/libosmocore.la $(TALLOC_LIBS) $(PTHREAD_LIBS)</span><br><span> </span><br><span> if ENABLE_SERCOM_STUB</span><br><span> noinst_LIBRARIES = libsercomstub.a</span><br><span>diff --git a/tests/logging/logging_vty_test.c b/tests/logging/logging_vty_test.c</span><br><span>index 30426f3..e7019f6 100644</span><br><span>--- a/tests/logging/logging_vty_test.c</span><br><span>+++ b/tests/logging/logging_vty_test.c</span><br><span>@@ -241,6 +241,7 @@</span><br><span> vty_init(&vty_info);</span><br><span> </span><br><span> osmo_init_logging2(root_ctx, &log_info);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_enable_multithread();</span><br><span> </span><br><span> vty_commands_init();</span><br><span> </span><br><span>diff --git a/utils/Makefile.am b/utils/Makefile.am</span><br><span>index fb79190..653b719 100644</span><br><span>--- a/utils/Makefile.am</span><br><span>+++ b/utils/Makefile.am</span><br><span>@@ -1,7 +1,7 @@</span><br><span> if ENABLE_UTILITIES</span><br><span> AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(TALLOC_CFLAGS)</span><br><span style="color: hsl(0, 100%, 40%);">-AM_CFLAGS = -Wall</span><br><span style="color: hsl(0, 100%, 40%);">-LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CFLAGS = -Wall $(PTHREAD_CFLAGS)</span><br><span style="color: hsl(120, 100%, 40%);">+LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la $(PTHREAD_LIBS)</span><br><span> </span><br><span> EXTRA_DIST = conv_gen.py conv_codes_gsm.py</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/15560">change 15560</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/libosmocore/+/15560"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Id7711893b34263baacac6caf4d489467053131bb </div>
<div style="display:none"> Gerrit-Change-Number: 15560 </div>
<div style="display:none"> Gerrit-PatchSet: 7 </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: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>