projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup unused health state reference
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
main.c
diff --git
a/src/bin/lttng-sessiond/main.c
b/src/bin/lttng-sessiond/main.c
index 58333c22df73fed08c3c64df0f6dac056dfd283e..034621e9da466ca1b4c49d0a7e4875f515e7fdaf 100644
(file)
--- a/
src/bin/lttng-sessiond/main.c
+++ b/
src/bin/lttng-sessiond/main.c
@@
-221,12
+221,6
@@
enum consumerd_state {
static enum consumerd_state ust_consumerd_state;
static enum consumerd_state kernel_consumerd_state;
static enum consumerd_state ust_consumerd_state;
static enum consumerd_state kernel_consumerd_state;
-/* Used for the health monitoring of the session daemon. See health.h */
-struct health_state health_thread_cmd;
-struct health_state health_thread_app_manage;
-struct health_state health_thread_app_reg;
-struct health_state health_thread_kernel;
-
/*
* Socket timeout for receiving and sending in seconds.
*/
/*
* Socket timeout for receiving and sending in seconds.
*/
@@
-705,14
+699,14
@@
static void *thread_manage_kernel(void *data)
goto error_testpoint;
}
goto error_testpoint;
}
- health_code_update(
&health_thread_kernel
);
+ health_code_update();
if (testpoint(thread_manage_kernel_before_loop)) {
goto error_testpoint;
}
while (1) {
if (testpoint(thread_manage_kernel_before_loop)) {
goto error_testpoint;
}
while (1) {
- health_code_update(
&health_thread_kernel
);
+ health_code_update();
if (update_poll_flag == 1) {
/* Clean events object. We are about to populate it again. */
if (update_poll_flag == 1) {
/* Clean events object. We are about to populate it again. */
@@
-740,9
+734,9
@@
static void *thread_manage_kernel(void *data)
/* Poll infinite value of time */
restart:
/* Poll infinite value of time */
restart:
- health_poll_update(
&health_thread_kernel
);
+ health_poll_update();
ret = lttng_poll_wait(&events, -1);
ret = lttng_poll_wait(&events, -1);
- health_poll_update(
&health_thread_kernel
);
+ health_poll_update();
if (ret < 0) {
/*
* Restart interrupted system call.
if (ret < 0) {
/*
* Restart interrupted system call.
@@
-765,7
+759,7
@@
static void *thread_manage_kernel(void *data)
revents = LTTNG_POLL_GETEV(&events, i);
pollfd = LTTNG_POLL_GETFD(&events, i);
revents = LTTNG_POLL_GETEV(&events, i);
pollfd = LTTNG_POLL_GETFD(&events, i);
- health_code_update(
&health_thread_kernel
);
+ health_code_update();
/* Thread quit pipe has been closed. Killing thread. */
ret = check_thread_quit_pipe(pollfd, revents);
/* Thread quit pipe has been closed. Killing thread. */
ret = check_thread_quit_pipe(pollfd, revents);
@@
-813,7
+807,7
@@
error_testpoint:
utils_close_pipe(kernel_poll_pipe);
kernel_poll_pipe[0] = kernel_poll_pipe[1] = -1;
if (err) {
utils_close_pipe(kernel_poll_pipe);
kernel_poll_pipe[0] = kernel_poll_pipe[1] = -1;
if (err) {
- health_error(
&health_thread_kernel
);
+ health_error();
ERR("Health error occurred in %s", __func__);
WARN("Kernel thread died unexpectedly. "
"Kernel tracing can continue but CPU hotplug is disabled.");
ERR("Health error occurred in %s", __func__);
WARN("Kernel thread died unexpectedly. "
"Kernel tracing can continue but CPU hotplug is disabled.");
@@
-878,7
+872,7
@@
static void *thread_manage_consumer(void *data)
* In a nutshell, the following poll update to the health state brings back
* the state to an even value meaning a code path.
*/
* In a nutshell, the following poll update to the health state brings back
* the state to an even value meaning a code path.
*/
- health_poll_update(
&consumer_data->health
);
+ health_poll_update();
/*
* Pass 2 as size here for the thread quit pipe and kconsumerd_err_sock.
/*
* Pass 2 as size here for the thread quit pipe and kconsumerd_err_sock.
@@
-899,18
+893,18
@@
static void *thread_manage_consumer(void *data)
goto error;
}
goto error;
}
- health_code_update(
&consumer_data->health
);
+ health_code_update();
/* Inifinite blocking call, waiting for transmission */
restart:
/* Inifinite blocking call, waiting for transmission */
restart:
- health_poll_update(
&consumer_data->health
);
+ health_poll_update();
if (testpoint(thread_manage_consumer)) {
goto error;
}
ret = lttng_poll_wait(&events, -1);
if (testpoint(thread_manage_consumer)) {
goto error;
}
ret = lttng_poll_wait(&events, -1);
- health_poll_update(
&consumer_data->health
);
+ health_poll_update();
if (ret < 0) {
/*
* Restart interrupted system call.
if (ret < 0) {
/*
* Restart interrupted system call.
@@
-928,7
+922,7
@@
restart:
revents = LTTNG_POLL_GETEV(&events, i);
pollfd = LTTNG_POLL_GETFD(&events, i);
revents = LTTNG_POLL_GETEV(&events, i);
pollfd = LTTNG_POLL_GETFD(&events, i);
- health_code_update(
&consumer_data->health
);
+ health_code_update();
/* Thread quit pipe has been closed. Killing thread. */
ret = check_thread_quit_pipe(pollfd, revents);
/* Thread quit pipe has been closed. Killing thread. */
ret = check_thread_quit_pipe(pollfd, revents);
@@
-957,7
+951,7
@@
restart:
*/
(void) utils_set_fd_cloexec(sock);
*/
(void) utils_set_fd_cloexec(sock);
- health_code_update(
&consumer_data->health
);
+ health_code_update();
DBG2("Receiving code from consumer err_sock");
DBG2("Receiving code from consumer err_sock");
@@
-968,7
+962,7
@@
restart:
goto error;
}
goto error;
}
- health_code_update(
&consumer_data->health
);
+ health_code_update();
if (code == LTTCOMM_CONSUMERD_COMMAND_SOCK_READY) {
consumer_data->cmd_sock =
if (code == LTTCOMM_CONSUMERD_COMMAND_SOCK_READY) {
consumer_data->cmd_sock =
@@
-998,13
+992,13
@@
restart:
goto error;
}
goto error;
}
- health_code_update(
&consumer_data->health
);
+ health_code_update();
/* Inifinite blocking call, waiting for transmission */
restart_poll:
/* Inifinite blocking call, waiting for transmission */
restart_poll:
- health_poll_update(
&consumer_data->health
);
+ health_poll_update();
ret = lttng_poll_wait(&events, -1);
ret = lttng_poll_wait(&events, -1);
- health_poll_update(
&consumer_data->health
);
+ health_poll_update();
if (ret < 0) {
/*
* Restart interrupted system call.
if (ret < 0) {
/*
* Restart interrupted system call.
@@
-1022,7
+1016,7
@@
restart_poll:
revents = LTTNG_POLL_GETEV(&events, i);
pollfd = LTTNG_POLL_GETFD(&events, i);
revents = LTTNG_POLL_GETEV(&events, i);
pollfd = LTTNG_POLL_GETFD(&events, i);
- health_code_update(
&consumer_data->health
);
+ health_code_update();
/* Thread quit pipe has been closed. Killing thread. */
ret = check_thread_quit_pipe(pollfd, revents);
/* Thread quit pipe has been closed. Killing thread. */
ret = check_thread_quit_pipe(pollfd, revents);
@@
-1040,7
+1034,7
@@
restart_poll:
}
}
}
}
- health_code_update(
&consumer_data->health
);
+ health_code_update();
/* Wait for any kconsumerd error */
ret = lttcomm_recv_unix_sock(sock, &code,
/* Wait for any kconsumerd error */
ret = lttcomm_recv_unix_sock(sock, &code,
@@
-1091,7
+1085,7
@@
error:
lttng_poll_clean(&events);
error_poll:
if (err) {
lttng_poll_clean(&events);
error_poll:
if (err) {
- health_error(
&consumer_data->health
);
+ health_error();
ERR("Health error occurred in %s", __func__);
}
health_unregister();
ERR("Health error occurred in %s", __func__);
}
health_unregister();
@@
-1121,7
+1115,7
@@
static void *thread_manage_apps(void *data)
goto error_testpoint;
}
goto error_testpoint;
}
- health_code_update(
&health_thread_app_manage
);
+ health_code_update();
ret = create_thread_poll_set(&events, 2);
if (ret < 0) {
ret = create_thread_poll_set(&events, 2);
if (ret < 0) {
@@
-1137,16
+1131,16
@@
static void *thread_manage_apps(void *data)
goto error;
}
goto error;
}
- health_code_update(
&health_thread_app_manage
);
+ health_code_update();
while (1) {
DBG("Apps thread polling on %d fds", LTTNG_POLL_GETNB(&events));
/* Inifinite blocking call, waiting for transmission */
restart:
while (1) {
DBG("Apps thread polling on %d fds", LTTNG_POLL_GETNB(&events));
/* Inifinite blocking call, waiting for transmission */
restart:
- health_poll_update(
&health_thread_app_manage
);
+ health_poll_update();
ret = lttng_poll_wait(&events, -1);
ret = lttng_poll_wait(&events, -1);
- health_poll_update(
&health_thread_app_manage
);
+ health_poll_update();
if (ret < 0) {
/*
* Restart interrupted system call.
if (ret < 0) {
/*
* Restart interrupted system call.
@@
-1164,7
+1158,7
@@
static void *thread_manage_apps(void *data)
revents = LTTNG_POLL_GETEV(&events, i);
pollfd = LTTNG_POLL_GETFD(&events, i);
revents = LTTNG_POLL_GETEV(&events, i);
pollfd = LTTNG_POLL_GETFD(&events, i);
- health_code_update(
&health_thread_app_manage
);
+ health_code_update();
/* Thread quit pipe has been closed. Killing thread. */
ret = check_thread_quit_pipe(pollfd, revents);
/* Thread quit pipe has been closed. Killing thread. */
ret = check_thread_quit_pipe(pollfd, revents);
@@
-1188,7
+1182,7
@@
static void *thread_manage_apps(void *data)
goto error;
}
goto error;
}
- health_code_update(
&health_thread_app_manage
);
+ health_code_update();
/* Register applicaton to the session daemon */
ret = ust_app_register(&ust_cmd.reg_msg,
/* Register applicaton to the session daemon */
ret = ust_app_register(&ust_cmd.reg_msg,
@@
-1199,7
+1193,7
@@
static void *thread_manage_apps(void *data)
break;
}
break;
}
- health_code_update(
&health_thread_app_manage
);
+ health_code_update();
/*
* Validate UST version compatibility.
/*
* Validate UST version compatibility.
@@
-1213,7
+1207,7
@@
static void *thread_manage_apps(void *data)
update_ust_app(ust_cmd.sock);
}
update_ust_app(ust_cmd.sock);
}
- health_code_update(
&health_thread_app_manage
);
+ health_code_update();
ret = ust_app_register_done(ust_cmd.sock);
if (ret < 0) {
ret = ust_app_register_done(ust_cmd.sock);
if (ret < 0) {
@@
-1244,7
+1238,7
@@
static void *thread_manage_apps(void *data)
ust_cmd.sock);
}
ust_cmd.sock);
}
- health_code_update(
&health_thread_app_manage
);
+ health_code_update();
break;
}
break;
}
@@
-1266,7
+1260,7
@@
static void *thread_manage_apps(void *data)
}
}
}
}
- health_code_update(
&health_thread_app_manage
);
+ health_code_update();
}
}
}
}
@@
-1285,7
+1279,7
@@
error_testpoint:
*/
if (err) {
*/
if (err) {
- health_error(
&health_thread_app_manage
);
+ health_error();
ERR("Health error occurred in %s", __func__);
}
health_unregister();
ERR("Health error occurred in %s", __func__);
}
health_unregister();
@@
-1424,9
+1418,9
@@
static void *thread_registration_apps(void *data)
/* Inifinite blocking call, waiting for transmission */
restart:
/* Inifinite blocking call, waiting for transmission */
restart:
- health_poll_update(
&health_thread_app_reg
);
+ health_poll_update();
ret = lttng_poll_wait(&events, -1);
ret = lttng_poll_wait(&events, -1);
- health_poll_update(
&health_thread_app_reg
);
+ health_poll_update();
if (ret < 0) {
/*
* Restart interrupted system call.
if (ret < 0) {
/*
* Restart interrupted system call.
@@
-1440,7
+1434,7
@@
static void *thread_registration_apps(void *data)
nb_fd = ret;
for (i = 0; i < nb_fd; i++) {
nb_fd = ret;
for (i = 0; i < nb_fd; i++) {
- health_code_update(
&health_thread_app_reg
);
+ health_code_update();
/* Fetch once the poll data */
revents = LTTNG_POLL_GETEV(&events, i);
/* Fetch once the poll data */
revents = LTTNG_POLL_GETEV(&events, i);
@@
-1492,7
+1486,7
@@
static void *thread_registration_apps(void *data)
sock = -1;
continue;
}
sock = -1;
continue;
}
- health_code_update(
&health_thread_app_reg
);
+ health_code_update();
ret = lttcomm_recv_unix_sock(sock, &ust_cmd->reg_msg,
sizeof(struct ust_register_msg));
if (ret < 0 || ret < sizeof(struct ust_register_msg)) {
ret = lttcomm_recv_unix_sock(sock, &ust_cmd->reg_msg,
sizeof(struct ust_register_msg));
if (ret < 0 || ret < sizeof(struct ust_register_msg)) {
@@
-1510,7
+1504,7
@@
static void *thread_registration_apps(void *data)
sock = -1;
continue;
}
sock = -1;
continue;
}
- health_code_update(
&health_thread_app_reg
);
+ health_code_update();
ust_cmd->sock = sock;
sock = -1;
ust_cmd->sock = sock;
sock = -1;
@@
-1541,7
+1535,7
@@
static void *thread_registration_apps(void *data)
exit:
error:
if (err) {
exit:
error:
if (err) {
- health_error(
&health_thread_app_reg
);
+ health_error();
ERR("Health error occurred in %s", __func__);
}
ERR("Health error occurred in %s", __func__);
}
@@
-3162,7
+3156,7
@@
static void *thread_manage_clients(void *data)
goto error_testpoint;
}
goto error_testpoint;
}
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
ret = lttcomm_listen_unix_sock(client_sock);
if (ret < 0) {
ret = lttcomm_listen_unix_sock(client_sock);
if (ret < 0) {
@@
-3195,16
+3189,16
@@
static void *thread_manage_clients(void *data)
goto error;
}
goto error;
}
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
while (1) {
DBG("Accepting client command ...");
/* Inifinite blocking call, waiting for transmission */
restart:
while (1) {
DBG("Accepting client command ...");
/* Inifinite blocking call, waiting for transmission */
restart:
- health_poll_update(
&health_thread_cmd
);
+ health_poll_update();
ret = lttng_poll_wait(&events, -1);
ret = lttng_poll_wait(&events, -1);
- health_poll_update(
&health_thread_cmd
);
+ health_poll_update();
if (ret < 0) {
/*
* Restart interrupted system call.
if (ret < 0) {
/*
* Restart interrupted system call.
@@
-3222,7
+3216,7
@@
static void *thread_manage_clients(void *data)
revents = LTTNG_POLL_GETEV(&events, i);
pollfd = LTTNG_POLL_GETFD(&events, i);
revents = LTTNG_POLL_GETEV(&events, i);
pollfd = LTTNG_POLL_GETFD(&events, i);
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
/* Thread quit pipe has been closed. Killing thread. */
ret = check_thread_quit_pipe(pollfd, revents);
/* Thread quit pipe has been closed. Killing thread. */
ret = check_thread_quit_pipe(pollfd, revents);
@@
-3242,7
+3236,7
@@
static void *thread_manage_clients(void *data)
DBG("Wait for client response");
DBG("Wait for client response");
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
sock = lttcomm_accept_unix_sock(client_sock);
if (sock < 0) {
sock = lttcomm_accept_unix_sock(client_sock);
if (sock < 0) {
@@
-3278,7
+3272,7
@@
static void *thread_manage_clients(void *data)
cmd_ctx->llm = NULL;
cmd_ctx->session = NULL;
cmd_ctx->llm = NULL;
cmd_ctx->session = NULL;
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
/*
* Data is received from the lttng client. The struct
/*
* Data is received from the lttng client. The struct
@@
-3299,7
+3293,7
@@
static void *thread_manage_clients(void *data)
continue;
}
continue;
}
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
// TODO: Validate cmd_ctx including sanity check for
// security purpose.
// TODO: Validate cmd_ctx including sanity check for
// security purpose.
@@
-3332,7
+3326,7
@@
static void *thread_manage_clients(void *data)
continue;
}
continue;
}
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
DBG("Sending response (size: %d, retcode: %s)",
cmd_ctx->lttng_msg_size,
DBG("Sending response (size: %d, retcode: %s)",
cmd_ctx->lttng_msg_size,
@@
-3351,7
+3345,7
@@
static void *thread_manage_clients(void *data)
clean_command_ctx(&cmd_ctx);
clean_command_ctx(&cmd_ctx);
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
}
exit:
}
exit:
@@
-3378,7
+3372,7
@@
error_testpoint:
}
if (err) {
}
if (err) {
- health_error(
&health_thread_cmd
);
+ health_error();
ERR("Health error occurred in %s", __func__);
}
ERR("Health error occurred in %s", __func__);
}
This page took
0.047372 seconds
and
4
git commands to generate.