projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: sessiond: unbalanced health register/unregister on error
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
rotation-thread.c
diff --git
a/src/bin/lttng-sessiond/rotation-thread.c
b/src/bin/lttng-sessiond/rotation-thread.c
index ee25baaf1964d8d5a1809a2e1bfc53f5f723d1df..d12bd9d0150cf1b998ba6bde49343f31f17c78e4 100644
(file)
--- a/
src/bin/lttng-sessiond/rotation-thread.c
+++ b/
src/bin/lttng-sessiond/rotation-thread.c
@@
-836,6
+836,10
@@
void *thread_rotation(void *data)
int queue_pipe_fd;
DBG("[rotation-thread] Started rotation thread");
int queue_pipe_fd;
DBG("[rotation-thread] Started rotation thread");
+ rcu_register_thread();
+ rcu_thread_online();
+ health_register(health_sessiond, HEALTH_SESSIOND_TYPE_ROTATION);
+ health_code_update();
if (!handle) {
ERR("[rotation-thread] Invalid thread context provided");
if (!handle) {
ERR("[rotation-thread] Invalid thread context provided");
@@
-845,11
+849,6
@@
void *thread_rotation(void *data)
queue_pipe_fd = lttng_pipe_get_readfd(
handle->rotation_timer_queue->event_pipe);
queue_pipe_fd = lttng_pipe_get_readfd(
handle->rotation_timer_queue->event_pipe);
- rcu_register_thread();
- rcu_thread_online();
-
- health_register(health_sessiond, HEALTH_SESSIOND_TYPE_ROTATION);
- health_code_update();
ret = init_thread_state(handle, &thread);
if (ret) {
ret = init_thread_state(handle, &thread);
if (ret) {
@@
-930,10
+929,10
@@
exit:
error:
DBG("[rotation-thread] Exit");
fini_thread_state(&thread);
error:
DBG("[rotation-thread] Exit");
fini_thread_state(&thread);
+end:
health_unregister(health_sessiond);
rcu_thread_offline();
rcu_unregister_thread();
health_unregister(health_sessiond);
rcu_thread_offline();
rcu_unregister_thread();
-end:
return NULL;
}
return NULL;
}
This page took
0.023365 seconds
and
4
git commands to generate.