projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean-up: lttng-sessiond: fix -Wshadow error in check_session_rotation_pending
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
dispatch.c
diff --git
a/src/bin/lttng-sessiond/dispatch.c
b/src/bin/lttng-sessiond/dispatch.c
index d33a3cba8fac0d231aabd527400b83adc7645d6f..22380fcdd58d4f1cdc878be9096ad8bf93a05db5 100644
(file)
--- a/
src/bin/lttng-sessiond/dispatch.c
+++ b/
src/bin/lttng-sessiond/dispatch.c
@@
-39,7
+39,7
@@
static void update_ust_app(int app_sock)
struct ust_app *app;
/* Consumer is in an ERROR state. Stop any application update. */
struct ust_app *app;
/* Consumer is in an ERROR state. Stop any application update. */
- if (uatomic_read(&ust_consumerd_state) == CONSUMER_ERROR) {
+ if (uatomic_read(&
the_
ust_consumerd_state) == CONSUMER_ERROR) {
/* Stop the update process since the consumer is dead. */
return;
}
/* Stop the update process since the consumer is dead. */
return;
}
@@
-235,7
+235,8
@@
static void *thread_dispatch_ust_registration(void *data)
rcu_register_thread();
rcu_register_thread();
- health_register(health_sessiond, HEALTH_SESSIOND_TYPE_APP_REG_DISPATCH);
+ health_register(the_health_sessiond,
+ HEALTH_SESSIOND_TYPE_APP_REG_DISPATCH);
if (testpoint(sessiond_thread_app_reg_dispatch)) {
goto error_testpoint;
if (testpoint(sessiond_thread_app_reg_dispatch)) {
goto error_testpoint;
@@
-486,7
+487,7
@@
error_testpoint:
health_error();
ERR("Health error occurred in %s", __func__);
}
health_error();
ERR("Health error occurred in %s", __func__);
}
- health_unregister(health_sessiond);
+ health_unregister(
the_
health_sessiond);
rcu_unregister_thread();
return NULL;
}
rcu_unregister_thread();
return NULL;
}
This page took
0.024639 seconds
and
4
git commands to generate.