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: sessiond: rename public accessors
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
agent-thread.cpp
diff --git
a/src/bin/lttng-sessiond/agent-thread.cpp
b/src/bin/lttng-sessiond/agent-thread.cpp
index c8fab6164f0c68b05b9545aab7abe25bbb192749..e54a7cecf6f450ec1e1594b42e9edb2e01a45b8b 100644
(file)
--- a/
src/bin/lttng-sessiond/agent-thread.cpp
+++ b/
src/bin/lttng-sessiond/agent-thread.cpp
@@
-355,12
+355,12
@@
void wait_until_thread_is_ready(struct thread_notifiers *notifiers)
*/
static void *thread_agent_management(void *data)
{
*/
static void *thread_agent_management(void *data)
{
- int i, ret
, pollfd
;
- uint32_t
revents,
nb_fd;
+ int i, ret;
+ uint32_t nb_fd;
struct lttng_poll_event events;
struct lttcomm_sock *reg_sock;
struct thread_notifiers *notifiers = (thread_notifiers *) data;
struct lttng_poll_event events;
struct lttcomm_sock *reg_sock;
struct thread_notifiers *notifiers = (thread_notifiers *) data;
- const
int quit_pipe_read
_fd = lttng_pipe_get_readfd(
+ const
auto thread_quit_pipe
_fd = lttng_pipe_get_readfd(
notifiers->quit_pipe);
DBG("Manage agent application registration.");
notifiers->quit_pipe);
DBG("Manage agent application registration.");
@@
-377,8
+377,7
@@
static void *thread_agent_management(void *data)
goto error_poll_create;
}
goto error_poll_create;
}
- ret = lttng_poll_add(&events, quit_pipe_read_fd,
- LPOLLIN | LPOLLERR);
+ ret = lttng_poll_add(&events, thread_quit_pipe_fd, LPOLLIN);
if (ret < 0) {
goto error_tcp_socket;
}
if (ret < 0) {
goto error_tcp_socket;
}
@@
-411,8
+410,7
@@
static void *thread_agent_management(void *data)
mark_thread_as_ready(notifiers);
/* Add TCP socket to the poll set. */
mark_thread_as_ready(notifiers);
/* Add TCP socket to the poll set. */
- ret = lttng_poll_add(&events, reg_sock->fd,
- LPOLLIN | LPOLLERR | LPOLLHUP | LPOLLRDHUP);
+ ret = lttng_poll_add(&events, reg_sock->fd, LPOLLIN | LPOLLRDHUP);
if (ret < 0) {
goto error;
}
if (ret < 0) {
goto error;
}
@@
-439,11
+437,12
@@
restart:
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);
- /* Thread quit pipe has been closed. Killing thread. */
- if (pollfd == quit_pipe_read_fd) {
+ /* Activity on thread quit pipe, exiting. */
+ if (pollfd == thread_quit_pipe_fd) {
+ DBG("Activity on thread quit pipe");
goto exit;
}
goto exit;
}
@@
-483,8
+482,7
@@
restart:
* read), only add poll error event to only
* detect shutdown.
*/
* read), only add poll error event to only
* detect shutdown.
*/
- ret = lttng_poll_add(&events, new_app_socket_fd,
- LPOLLERR | LPOLLHUP | LPOLLRDHUP);
+ ret = lttng_poll_add(&events, new_app_socket_fd, LPOLLRDHUP);
if (ret < 0) {
agent_destroy_app(new_app);
continue;
if (ret < 0) {
agent_destroy_app(new_app);
continue;
This page took
0.026331 seconds
and
4
git commands to generate.