projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: error: remove trailing period from error descriptions
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
notification-thread.c
diff --git
a/src/bin/lttng-sessiond/notification-thread.c
b/src/bin/lttng-sessiond/notification-thread.c
index 1ba724337b67ee69a1856087a5c8b65c45a32cd8..d2f5a944129d21e49c9b4a9b2b9ce1ec85952d56 100644
(file)
--- a/
src/bin/lttng-sessiond/notification-thread.c
+++ b/
src/bin/lttng-sessiond/notification-thread.c
@@
-27,6
+27,7
@@
#include "lttng-sessiond.h"
#include "health-sessiond.h"
#include "thread.h"
#include "lttng-sessiond.h"
#include "health-sessiond.h"
#include "thread.h"
+#include "testpoint.h"
#include "kernel.h"
#include <common/kernel-ctl/kernel-ctl.h>
#include "kernel.h"
#include <common/kernel-ctl/kernel-ctl.h>
@@
-35,6
+36,8
@@
#include <urcu/list.h>
#include <urcu/rculfhash.h>
#include <urcu/list.h>
#include <urcu/rculfhash.h>
+
+int notifier_consumption_paused;
/*
* Destroy the thread data previously created by the init function.
*/
/*
* Destroy the thread data previously created by the init function.
*/
@@
-193,7
+196,7
@@
void notification_channel_socket_destroy(int fd)
int ret;
char *sock_path = get_notification_channel_sock_path();
int ret;
char *sock_path = get_notification_channel_sock_path();
- DBG("
[notification-thread]
Destroying notification channel socket");
+ DBG("Destroying notification channel socket");
if (sock_path) {
ret = unlink(sock_path);
if (sock_path) {
ret = unlink(sock_path);
@@
-215,12
+218,12
@@
int notification_channel_socket_create(void)
int fd = -1, ret;
char *sock_path = get_notification_channel_sock_path();
int fd = -1, ret;
char *sock_path = get_notification_channel_sock_path();
- DBG("
[notification-thread]
Creating notification channel UNIX socket at %s",
+ DBG("Creating notification channel UNIX socket at %s",
sock_path);
ret = lttcomm_create_unix_sock(sock_path);
if (ret < 0) {
sock_path);
ret = lttcomm_create_unix_sock(sock_path);
if (ret < 0) {
- ERR("
[notification-thread]
Failed to create notification socket");
+ ERR("Failed to create notification socket");
goto error;
}
fd = ret;
goto error;
}
fd = ret;
@@
-235,8
+238,8
@@
int notification_channel_socket_create(void)
if (getuid() == 0) {
gid_t gid;
if (getuid() == 0) {
gid_t gid;
- ret =
utils_get_group_id(config.tracing_group_name.value, tr
ue,
- &gid);
+ ret =
utils_get_group_id(the_config.tracing_group_name.val
ue,
+
true,
&gid);
if (ret) {
/* Default to root group. */
gid = 0;
if (ret) {
/* Default to root group. */
gid = 0;
@@
-250,7
+253,7
@@
int notification_channel_socket_create(void)
}
}
}
}
- DBG("
[notification-thread]
Notification channel UNIX socket created (fd = %i)",
+ DBG("Notification channel UNIX socket created (fd = %i)",
fd);
free(sock_path);
return fd;
fd);
free(sock_path);
return fd;
@@
-285,27
+288,27
@@
int init_poll_set(struct lttng_poll_event *poll_set,
ret = lttng_poll_add(poll_set, notification_channel_socket,
LPOLLIN | LPOLLERR | LPOLLHUP | LPOLLRDHUP);
if (ret < 0) {
ret = lttng_poll_add(poll_set, notification_channel_socket,
LPOLLIN | LPOLLERR | LPOLLHUP | LPOLLRDHUP);
if (ret < 0) {
- ERR("
[notification-thread]
Failed to add notification channel socket to pollset");
+ ERR("Failed to add notification channel socket to pollset");
goto error;
}
ret = lttng_poll_add(poll_set, lttng_pipe_get_readfd(handle->cmd_queue.event_pipe),
LPOLLIN | LPOLLERR);
if (ret < 0) {
goto error;
}
ret = lttng_poll_add(poll_set, lttng_pipe_get_readfd(handle->cmd_queue.event_pipe),
LPOLLIN | LPOLLERR);
if (ret < 0) {
- ERR("
[notification-thread]
Failed to add notification command queue event fd to pollset");
+ ERR("Failed to add notification command queue event fd to pollset");
goto error;
}
ret = lttng_poll_add(poll_set,
handle->channel_monitoring_pipes.ust32_consumer,
LPOLLIN | LPOLLERR);
if (ret < 0) {
goto error;
}
ret = lttng_poll_add(poll_set,
handle->channel_monitoring_pipes.ust32_consumer,
LPOLLIN | LPOLLERR);
if (ret < 0) {
- ERR("
[notification-thread]
Failed to add ust-32 channel monitoring pipe fd to pollset");
+ ERR("Failed to add ust-32 channel monitoring pipe fd to pollset");
goto error;
}
ret = lttng_poll_add(poll_set,
handle->channel_monitoring_pipes.ust64_consumer,
LPOLLIN | LPOLLERR);
if (ret < 0) {
goto error;
}
ret = lttng_poll_add(poll_set,
handle->channel_monitoring_pipes.ust64_consumer,
LPOLLIN | LPOLLERR);
if (ret < 0) {
- ERR("
[notification-thread]
Failed to add ust-64 channel monitoring pipe fd to pollset");
+ ERR("Failed to add ust-64 channel monitoring pipe fd to pollset");
goto error;
}
if (handle->channel_monitoring_pipes.kernel_consumer < 0) {
goto error;
}
if (handle->channel_monitoring_pipes.kernel_consumer < 0) {
@@
-315,7
+318,7
@@
int init_poll_set(struct lttng_poll_event *poll_set,
handle->channel_monitoring_pipes.kernel_consumer,
LPOLLIN | LPOLLERR);
if (ret < 0) {
handle->channel_monitoring_pipes.kernel_consumer,
LPOLLIN | LPOLLERR);
if (ret < 0) {
- ERR("
[notification-thread]
Failed to add kernel channel monitoring pipe fd to pollset");
+ ERR("Failed to add kernel channel monitoring pipe fd to pollset");
goto error;
}
end:
goto error;
}
end:
@@
-434,10
+437,10
@@
int init_thread_state(struct notification_thread_handle *handle,
goto end;
}
goto end;
}
- DBG("
[notification-thread]
Listening on notification channel socket");
+ DBG("Listening on notification channel socket");
ret = lttcomm_listen_unix_sock(state->notification_channel_socket);
if (ret < 0) {
ret = lttcomm_listen_unix_sock(state->notification_channel_socket);
if (ret < 0) {
- ERR("
[notification-thread]
Listen failed on notification channel socket");
+ ERR("Listen failed on notification channel socket");
goto error;
}
goto error;
}
@@
-510,6
+513,9
@@
int init_thread_state(struct notification_thread_handle *handle,
if (!state->executor) {
goto error;
}
if (!state->executor) {
goto error;
}
+
+ state->restart_poll = false;
+
mark_thread_as_ready(handle);
end:
return 0;
mark_thread_as_ready(handle);
end:
return 0;
@@
-538,7
+544,7
@@
int handle_channel_monitoring_pipe(int fd, uint32_t revents,
if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) {
ret = lttng_poll_del(&state->events, fd);
if (ret) {
if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) {
ret = lttng_poll_del(&state->events, fd);
if (ret) {
- ERR("
[notification-thread]
Failed to remove consumer monitoring pipe from poll set");
+ ERR("Failed to remove consumer monitoring pipe from poll set");
}
goto end;
}
}
goto end;
}
@@
-546,7
+552,7
@@
int handle_channel_monitoring_pipe(int fd, uint32_t revents,
ret = handle_notification_thread_channel_sample(
state, fd, domain);
if (ret) {
ret = handle_notification_thread_channel_sample(
state, fd, domain);
if (ret) {
- ERR("
[notification-thread]
Consumer sample handling error occurred");
+ ERR("Consumer sample handling error occurred");
ret = -1;
goto end;
}
ret = -1;
goto end;
}
@@
-565,20
+571,32
@@
static int handle_event_notification_pipe(int event_source_fd,
ret = handle_notification_thread_remove_tracer_event_source_no_result(
state, event_source_fd);
if (ret) {
ret = handle_notification_thread_remove_tracer_event_source_no_result(
state, event_source_fd);
if (ret) {
- ERR("
[notification-thread]
Failed to remove event notification pipe from poll set: fd = %d",
+ ERR("Failed to remove event notification pipe from poll set: fd = %d",
event_source_fd);
}
goto end;
}
event_source_fd);
}
goto end;
}
+ if (testpoint(sessiond_handle_notifier_event_pipe)) {
+ ret = 0;
+ goto end;
+ }
+
+ if (caa_unlikely(notifier_consumption_paused)) {
+ DBG("Event notifier notification consumption paused, sleeping...");
+ sleep(1);
+ goto end;
+ }
+
ret = handle_notification_thread_event_notification(
state, event_source_fd, domain);
if (ret) {
ret = handle_notification_thread_event_notification(
state, event_source_fd, domain);
if (ret) {
- ERR("
[notification-thread]
Event notification handling error occurred for fd: %d",
+ ERR("Event notification handling error occurred for fd: %d",
event_source_fd);
ret = -1;
goto end;
}
event_source_fd);
ret = -1;
goto end;
}
+
end:
return ret;
}
end:
return ret;
}
@@
-619,14
+637,14
@@
void *thread_notification(void *data)
struct notification_thread_state state;
enum lttng_domain_type domain;
struct notification_thread_state state;
enum lttng_domain_type domain;
- DBG("
[notification-thread]
Started notification thread");
+ DBG("Started notification thread");
- health_register(health_sessiond, HEALTH_SESSIOND_TYPE_NOTIFICATION);
+ health_register(
the_
health_sessiond, HEALTH_SESSIOND_TYPE_NOTIFICATION);
rcu_register_thread();
rcu_thread_online();
if (!handle) {
rcu_register_thread();
rcu_thread_online();
if (!handle) {
- ERR("
[notification-thread]
Invalid thread context provided");
+ ERR("Invalid thread context provided");
goto end;
}
goto end;
}
@@
-637,13
+655,17
@@
void *thread_notification(void *data)
goto end;
}
goto end;
}
+ if (testpoint(sessiond_thread_notification)) {
+ goto end;
+ }
+
while (true) {
int fd_count, i;
health_poll_entry();
while (true) {
int fd_count, i;
health_poll_entry();
- DBG("
[notification-thread]
Entering poll wait");
+ DBG("Entering poll wait");
ret = lttng_poll_wait(&state.events, -1);
ret = lttng_poll_wait(&state.events, -1);
- DBG("
[notification-thread]
Poll wait returned (%i)", ret);
+ DBG("Poll wait returned (%i)", ret);
health_poll_exit();
if (ret < 0) {
/*
health_poll_exit();
if (ret < 0) {
/*
@@
-652,16
+674,22
@@
void *thread_notification(void *data)
if (errno == EINTR) {
continue;
}
if (errno == EINTR) {
continue;
}
- ERR("
[notification-thread]
Error encountered during lttng_poll_wait (%i)", ret);
+ ERR("Error encountered during lttng_poll_wait (%i)", ret);
goto error;
}
goto error;
}
+ /*
+ * Reset restart_poll flag so that calls below might turn it
+ * on.
+ */
+ state.restart_poll = false;
+
fd_count = ret;
for (i = 0; i < fd_count; i++) {
int fd = LTTNG_POLL_GETFD(&state.events, i);
uint32_t revents = LTTNG_POLL_GETEV(&state.events, i);
fd_count = ret;
for (i = 0; i < fd_count; i++) {
int fd = LTTNG_POLL_GETFD(&state.events, i);
uint32_t revents = LTTNG_POLL_GETEV(&state.events, i);
- DBG("
[notification-thread]
Handling fd (%i) activity (%u)", fd, revents);
+ DBG("Handling fd (%i) activity (%u)", fd, revents);
if (fd == state.notification_channel_socket) {
if (revents & LPOLLIN) {
if (fd == state.notification_channel_socket) {
if (revents & LPOLLIN) {
@@
-672,17
+700,17
@@
void *thread_notification(void *data)
}
} else if (revents &
(LPOLLERR | LPOLLHUP | LPOLLRDHUP)) {
}
} else if (revents &
(LPOLLERR | LPOLLHUP | LPOLLRDHUP)) {
- ERR("
[notification-thread]
Notification socket poll error");
+ ERR("Notification socket poll error");
goto error;
} else {
goto error;
} else {
- ERR("
[notification-thread]
Unexpected poll events %u for notification socket %i", revents, fd);
+ ERR("Unexpected poll events %u for notification socket %i", revents, fd);
goto error;
}
} else if (fd == lttng_pipe_get_readfd(handle->cmd_queue.event_pipe)) {
ret = handle_notification_thread_command(handle,
&state);
if (ret < 0) {
goto error;
}
} else if (fd == lttng_pipe_get_readfd(handle->cmd_queue.event_pipe)) {
ret = handle_notification_thread_command(handle,
&state);
if (ret < 0) {
- DBG("
[notification-thread]
Error encountered while servicing command queue");
+ DBG("Error encountered while servicing command queue");
goto error;
} else if (ret > 0) {
goto exit;
goto error;
} else if (ret > 0) {
goto exit;
@@
-733,6
+761,15
@@
void *thread_notification(void *data)
}
}
}
}
}
}
+
+ /*
+ * Calls above might have changed the state of the
+ * FDs in `state.events`. Call _poll_wait() again to
+ * ensure we have a consistent state.
+ */
+ if (state.restart_poll) {
+ break;
+ }
}
}
exit:
}
}
exit:
@@
-741,7
+778,7
@@
error:
end:
rcu_thread_offline();
rcu_unregister_thread();
end:
rcu_thread_offline();
rcu_unregister_thread();
- health_unregister(health_sessiond);
+ health_unregister(
the_
health_sessiond);
return NULL;
}
return NULL;
}
This page took
0.03053 seconds
and
4
git commands to generate.