X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Ftracepoint.c;h=f65097f6aaa92cc640eab93751847d32abf9556d;hb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;hp=cf7cf63c992d16e90647aa5856d82059bf05c2db;hpb=10544ee8af31afb239e3dfa71cb2fe09d3de3771;p=lttng-ust.git diff --git a/liblttng-ust/tracepoint.c b/liblttng-ust/tracepoint.c index cf7cf63c..f65097f6 100644 --- a/liblttng-ust/tracepoint.c +++ b/liblttng-ust/tracepoint.c @@ -1,21 +1,9 @@ /* + * SPDX-License-Identifier: LGPL-2.1-only + * * Copyright (C) 2008-2011 Mathieu Desnoyers * Copyright (C) 2009 Pierre-Marc Fournier * - * 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; - * 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 - * * Ported to userspace by Pierre-Marc Fournier. */ @@ -60,15 +48,6 @@ static int initialized; */ static int tracepoint_destructors_state = 1; -/* - * Expose the now deprecated symbol __tracepoints__disable_destructors for - * backward compatibility of applications built against old versions of - * lttng-ust. We need to keep __tracepoints__disable_destructors up to date - * within the new destructor disabling API because old applications read this - * symbol directly. - */ -int __tracepoints__disable_destructors __attribute__((weak)); - static void (*new_tracepoint_cb)(struct lttng_ust_tracepoint *); /* @@ -151,72 +130,6 @@ struct callsite_entry { bool tp_entry_callsite_ref; /* Has a tp_entry took a ref on this callsite */ }; -static int tracepoint_v1_api_used; -static void (*lttng_ust_liburcu_bp_synchronize_rcu)(void); -static void (*lttng_ust_liburcu_bp_rcu_read_lock)(void); -static void (*lttng_ust_liburcu_bp_rcu_read_unlock)(void); -void (*lttng_ust_liburcu_bp_before_fork)(void); -void (*lttng_ust_liburcu_bp_after_fork_parent)(void); -void (*lttng_ust_liburcu_bp_after_fork_child)(void); - -static bool lttng_ust_tracepoint_v1_used(void) -{ - return uatomic_read(&tracepoint_v1_api_used); -} - -static void lttng_ust_tracepoint_set_v1_used(void) -{ - if (!lttng_ust_tracepoint_v1_used()) { - /* - * Perform dlsym here rather than lazily on first use to - * eliminate nesting of dynamic loader lock (used within - * dlsym) inside the ust lock. - */ - if (!lttng_ust_liburcu_bp_synchronize_rcu) { - lttng_ust_liburcu_bp_synchronize_rcu = URCU_FORCE_CAST(void (*)(void), - dlsym(RTLD_DEFAULT, "synchronize_rcu_bp")); - if (!lttng_ust_liburcu_bp_synchronize_rcu) - abort(); - } - if (!lttng_ust_liburcu_bp_before_fork) { - lttng_ust_liburcu_bp_before_fork = URCU_FORCE_CAST(void (*)(void), - dlsym(RTLD_DEFAULT, "rcu_bp_before_fork")); - if (!lttng_ust_liburcu_bp_before_fork) - abort(); - } - if (!lttng_ust_liburcu_bp_after_fork_parent) { - lttng_ust_liburcu_bp_after_fork_parent = URCU_FORCE_CAST(void (*)(void), - dlsym(RTLD_DEFAULT, "rcu_bp_after_fork_parent")); - if (!lttng_ust_liburcu_bp_after_fork_parent) - abort(); - } - if (!lttng_ust_liburcu_bp_after_fork_child) { - lttng_ust_liburcu_bp_after_fork_child = URCU_FORCE_CAST(void (*)(void), - dlsym(RTLD_DEFAULT, "rcu_bp_after_fork_child")); - if (!lttng_ust_liburcu_bp_after_fork_child) - abort(); - } - if (!lttng_ust_liburcu_bp_rcu_read_lock) { - lttng_ust_liburcu_bp_rcu_read_lock = URCU_FORCE_CAST(void (*)(void), - dlsym(RTLD_DEFAULT, "rcu_read_lock_bp")); - if (!lttng_ust_liburcu_bp_rcu_read_lock) - abort(); - } - if (!lttng_ust_liburcu_bp_rcu_read_unlock) { - lttng_ust_liburcu_bp_rcu_read_unlock = URCU_FORCE_CAST(void (*)(void), - dlsym(RTLD_DEFAULT, "rcu_read_unlock_bp")); - if (!lttng_ust_liburcu_bp_rcu_read_unlock) - abort(); - } - - /* Fixup URCU bp TLS. */ - lttng_ust_liburcu_bp_rcu_read_lock(); - lttng_ust_liburcu_bp_rcu_read_unlock(); - - uatomic_set(&tracepoint_v1_api_used, 1); - } -} - /* coverity[+alloc] */ static void *allocate_probes(int count) { @@ -946,7 +859,7 @@ static void new_tracepoints(struct lttng_ust_tracepoint * const *start, * against recent liblttng-ust headers require a recent liblttng-ust * runtime for those tracepoints to be taken into account. */ -int tracepoint_register_lib2(struct lttng_ust_tracepoint * const *tracepoints_start, +int tracepoint_register_lib(struct lttng_ust_tracepoint * const *tracepoints_start, int tracepoints_count) { struct tracepoint_lib *pl, *iter; @@ -995,15 +908,7 @@ lib_added: return 0; } -/* Exposed for backward compatibility with old instrumented applications. */ -int tracepoint_register_lib(struct lttng_ust_tracepoint * const *tracepoints_start, - int tracepoints_count) -{ - lttng_ust_tracepoint_set_v1_used(); - return tracepoint_register_lib2(tracepoints_start, tracepoints_count); -} - -int tracepoint_unregister_lib2(struct lttng_ust_tracepoint * const *tracepoints_start) +int tracepoint_unregister_lib(struct lttng_ust_tracepoint * const *tracepoints_start) { struct tracepoint_lib *lib; @@ -1029,13 +934,6 @@ int tracepoint_unregister_lib2(struct lttng_ust_tracepoint * const *tracepoints_ return 0; } -/* Exposed for backward compatibility with old instrumented applications. */ -int tracepoint_unregister_lib(struct lttng_ust_tracepoint * const *tracepoints_start) -{ - lttng_ust_tracepoint_set_v1_used(); - return tracepoint_unregister_lib2(tracepoints_start); -} - /* * Report in debug message whether the compiler correctly supports weak * hidden symbols. This test checks that the address associated with two @@ -1121,28 +1019,4 @@ int tp_get_destructors_state(void) void lttng_ust_synchronize_trace(void) { lttng_ust_urcu_synchronize_rcu(); - /* - * For legacy tracepoint instrumentation, also wait for urcu-bp - * grace period. - */ - if (lttng_ust_liburcu_bp_synchronize_rcu) - lttng_ust_liburcu_bp_synchronize_rcu(); -} - -/* - * Create the wrapper symbols for legacy v1 API. - */ -void tp_rcu_read_lock_bp(void) -{ - lttng_ust_urcu_read_lock(); -} - -void tp_rcu_read_unlock_bp(void) -{ - lttng_ust_urcu_read_unlock(); -} - -void *tp_rcu_dereference_sym_bp(void *p) -{ - return lttng_ust_rcu_dereference(p); }