projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Standardize quit pipes behavior
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
manage-kernel.cpp
diff --git
a/src/bin/lttng-sessiond/manage-kernel.cpp
b/src/bin/lttng-sessiond/manage-kernel.cpp
index 8d2795466bb32400beda37fd2757aa1b94cb5441..0920852501d486e2d1a6bbdf7ba07189a54a6423 100644
(file)
--- a/
src/bin/lttng-sessiond/manage-kernel.cpp
+++ b/
src/bin/lttng-sessiond/manage-kernel.cpp
@@
-165,12
+165,12
@@
error:
*/
static void *thread_kernel_management(void *data)
{
*/
static void *thread_kernel_management(void *data)
{
- int ret, i,
pollfd,
update_poll_flag = 1, err = -1;
- uint32_t
revents,
nb_fd;
+ int ret, i, update_poll_flag = 1, err = -1;
+ uint32_t nb_fd;
char tmp;
struct lttng_poll_event events;
struct thread_notifiers *notifiers = (thread_notifiers *) data;
char tmp;
struct lttng_poll_event events;
struct thread_notifiers *notifiers = (thread_notifiers *) data;
- const
int quit_pipe_read
_fd = lttng_pipe_get_readfd(notifiers->quit_pipe);
+ const
auto thread_quit_pipe
_fd = lttng_pipe_get_readfd(notifiers->quit_pipe);
DBG("[thread] Thread manage kernel started");
DBG("[thread] Thread manage kernel started");
@@
-212,7
+212,7
@@
static void *thread_kernel_management(void *data)
}
ret = lttng_poll_add(&events,
}
ret = lttng_poll_add(&events,
-
quit_pipe_read
_fd,
+
thread_quit_pipe
_fd,
LPOLLIN);
if (ret < 0) {
goto error;
LPOLLIN);
if (ret < 0) {
goto error;
@@
-254,12
+254,14
@@
static void *thread_kernel_management(void *data)
for (i = 0; i < nb_fd; i++) {
/* Fetch once the poll data */
for (i = 0; i < nb_fd; i++) {
/* Fetch once the poll data */
- revents = LTTNG_POLL_GETEV(&events, i);
- pollfd = LTTNG_POLL_GETFD(&events, i);
+
const auto
revents = LTTNG_POLL_GETEV(&events, i);
+
const auto
pollfd = LTTNG_POLL_GETFD(&events, i);
health_code_update();
health_code_update();
- if (pollfd == quit_pipe_read_fd) {
+ /* Activity on thread quit pipe, exiting. */
+ if (pollfd == thread_quit_pipe_fd) {
+ DBG("Activity on thread quit pipe");
err = 0;
goto exit;
}
err = 0;
goto exit;
}
This page took
0.030374 seconds
and
4
git commands to generate.