X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-comm.c;h=a269104965e9c8348af7bb4a89c3f65ec6d634a9;hb=c73b6bcde2c1136b9cf18e859746bb2f3201cd7a;hp=8d90e2c367dafae1a88b8f077208a8fb0596e82d;hpb=d61ad9ef7bc9a9650ae9e2793ff7e3afe816a670;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index 8d90e2c3..a2691049 100644
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -1,22 +1,8 @@
 /*
- * lttng-ust-comm.c
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
  * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
  * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #define _LGPL_SOURCE
@@ -43,7 +29,6 @@
 #include <urcu/compiler.h>
 #include <lttng/urcu/urcu-ust.h>
 
-#include <lttng/align.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-abi.h>
 #include <lttng/ust.h>
@@ -53,7 +38,7 @@
 #include <ust-comm.h>
 #include <ust-fd.h>
 #include <usterr-signal-safe.h>
-#include <helper.h>
+#include <ust-helper.h>
 #include "tracepoint-internal.h"
 #include "lttng-tracer-core.h"
 #include "compat.h"
@@ -63,6 +48,8 @@
 #include "../libringbuffer/getcpu.h"
 #include "getenv.h"
 #include "ust-events-internal.h"
+#include "context-internal.h"
+#include "ust-compat.h"
 
 /* Concatenate lttng ust shared library name with its major version number. */
 #define LTTNG_UST_LIB_SO_NAME "liblttng-ust.so." __ust_stringify(CONFIG_LTTNG_UST_LIBRARY_VERSION_MAJOR)
@@ -373,9 +360,13 @@ extern void lttng_ring_buffer_client_overwrite_rt_exit(void);
 extern void lttng_ring_buffer_client_discard_exit(void);
 extern void lttng_ring_buffer_client_discard_rt_exit(void);
 extern void lttng_ring_buffer_metadata_client_exit(void);
+LTTNG_HIDDEN
 extern void lttng_counter_client_percpu_32_modular_init(void);
+LTTNG_HIDDEN
 extern void lttng_counter_client_percpu_32_modular_exit(void);
+LTTNG_HIDDEN
 extern void lttng_counter_client_percpu_64_modular_init(void);
+LTTNG_HIDDEN
 extern void lttng_counter_client_percpu_64_modular_exit(void);
 
 static char *get_map_shm(struct sock_info *sock_info);
@@ -430,17 +421,17 @@ void lttng_fixup_ust_mutex_nest_tls(void)
 }
 
 /*
- * Fixup urcu bp TLS.
+ * Fixup lttng-ust urcu TLS.
  */
 static
-void lttng_fixup_urcu_bp_tls(void)
+void lttng_fixup_lttng_ust_urcu_tls(void)
 {
 	(void) lttng_ust_urcu_read_ongoing();
 }
 
 void lttng_ust_fixup_tls(void)
 {
-	lttng_fixup_urcu_bp_tls();
+	lttng_fixup_lttng_ust_urcu_tls();
 	lttng_fixup_ringbuffer_tls();
 	lttng_fixup_vtid_tls();
 	lttng_fixup_nest_count_tls();
@@ -1727,7 +1718,7 @@ void wait_for_sessiond(struct sock_info *sock_info)
 "Please upgrade your kernel "
 "(fix is commit 9ea71503a8ed9184d2d0b8ccc4d269d05f7940ae in Linux kernel "
 "mainline). LTTng-UST will use polling mode fallback.");
-			if (ust_debug())
+			if (ust_err_debug_enabled())
 				PERROR("futex");
 			goto end_wait;
 		}
@@ -2116,8 +2107,8 @@ void __attribute__((constructor)) lttng_ust_init(void)
 	 * sessiond (otherwise leading to errors when trying to create
 	 * sessiond before the init functions are completed).
 	 */
-	init_usterr();
-	lttng_ust_getenv_init();	/* Needs init_usterr() to be completed. */
+	ust_err_init();
+	lttng_ust_getenv_init();	/* Needs ust_err_init() to be completed. */
 	init_tracepoint();
 	lttng_ust_init_fd_tracker();
 	lttng_ust_clock_init();
@@ -2402,8 +2393,6 @@ void ust_before_fork(sigset_t *save_sigset)
 
 	ust_lock_nocheck();
 	lttng_ust_urcu_before_fork();
-	if (lttng_ust_liburcu_bp_before_fork)
-		lttng_ust_liburcu_bp_before_fork();
 	lttng_ust_lock_fd_tracker();
 	lttng_perf_lock();
 }
@@ -2432,8 +2421,6 @@ void ust_after_fork_parent(sigset_t *restore_sigset)
 		return;
 	DBG("process %d", getpid());
 	lttng_ust_urcu_after_fork_parent();
-	if (lttng_ust_liburcu_bp_after_fork_parent)
-		lttng_ust_liburcu_bp_after_fork_parent();
 	/* Release mutexes and reenable signals */
 	ust_after_fork_common(restore_sigset);
 }
@@ -2460,8 +2447,6 @@ void ust_after_fork_child(sigset_t *restore_sigset)
 	DBG("process %d", getpid());
 	/* Release urcu mutexes */
 	lttng_ust_urcu_after_fork_child();
-	if (lttng_ust_liburcu_bp_after_fork_child)
-		lttng_ust_liburcu_bp_after_fork_child();
 	lttng_ust_cleanup(0);
 	/* Release mutexes and reenable signals */
 	ust_after_fork_common(restore_sigset);