projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: lttng perf counter deadlock
[lttng-ust.git]
/
liblttng-ust
/
lttng-ust-comm.c
diff --git
a/liblttng-ust/lttng-ust-comm.c
b/liblttng-ust/lttng-ust-comm.c
index 8b03125e28646701801cbed5b207e4c3d5fb5801..f8e450e1d6c3335ceadd59c79fa41768324edf72 100644
(file)
--- a/
liblttng-ust/lttng-ust-comm.c
+++ b/
liblttng-ust/lttng-ust-comm.c
@@
-418,6
+418,7
@@
void lttng_ust_fixup_tls(void)
lttng_fixup_nest_count_tls();
lttng_fixup_procname_tls();
lttng_fixup_ust_mutex_nest_tls();
lttng_fixup_nest_count_tls();
lttng_fixup_procname_tls();
lttng_fixup_ust_mutex_nest_tls();
+ lttng_ust_fixup_perf_counter_tls();
lttng_ust_fixup_fd_tracker_tls();
}
lttng_ust_fixup_fd_tracker_tls();
}
@@
-2027,6
+2028,7
@@
void ust_before_fork(sigset_t *save_sigset)
ust_lock_nocheck();
rcu_bp_before_fork();
lttng_ust_lock_fd_tracker();
ust_lock_nocheck();
rcu_bp_before_fork();
lttng_ust_lock_fd_tracker();
+ lttng_perf_lock();
}
static void ust_after_fork_common(sigset_t *restore_sigset)
}
static void ust_after_fork_common(sigset_t *restore_sigset)
@@
-2034,6
+2036,7
@@
static void ust_after_fork_common(sigset_t *restore_sigset)
int ret;
DBG("process %d", getpid());
int ret;
DBG("process %d", getpid());
+ lttng_perf_unlock();
lttng_ust_unlock_fd_tracker();
ust_unlock();
lttng_ust_unlock_fd_tracker();
ust_unlock();
This page took
0.023055 seconds
and
4
git commands to generate.