#include <common/uri.h>
#include <common/utils.h>
+#include <common/compat/endian.h>
+
#include "fd-limit.h"
#include "jul-thread.h"
#include "lttng-sessiond.h"
* can let the user define a custom one. However, localhost is ALWAYS the
* default listening address.
*/
-static const char *default_reg_uri = "tcp://localhost";
+static const char *default_reg_uri =
+ "tcp://" DEFAULT_NETWORK_VIEWER_BIND_ADDRESS;
/*
* Update JUL application using the given socket. This is done just after
ret = sock->ops->bind(sock);
if (ret < 0) {
- WARN("An other session daemon is using this JUL port. JUL support "
- "will be deactivated not interfering with the tracing.");
+ WARN("Another session daemon is using this JUL port. JUL support "
+ "will be deactivated to prevent interfering with the tracing.");
goto error;
}
size = new_sock->ops->recvmsg(new_sock, &msg, sizeof(msg), 0);
if (size < sizeof(msg)) {
- ret = -errno;
+ ret = -EINVAL;
goto error_socket;
}
pid = be32toh(msg.pid);
}
while (1) {
- DBG3("[jul-thread] Manage JUL polling on %d fds",
- LTTNG_POLL_GETNB(&events));
+ DBG3("[jul-thread] Manage JUL polling");
/* Inifinite blocking call, waiting for transmission */
restart:
ret = lttng_poll_wait(&events, -1);
+ DBG3("[jul-thread] Manage agent return from poll on %d fds",
+ LTTNG_POLL_GETNB(&events));
if (ret < 0) {
/*
* Restart interrupted system call.
revents = LTTNG_POLL_GETEV(&events, i);
pollfd = LTTNG_POLL_GETFD(&events, i);
+ if (!revents) {
+ /* No activity for this FD (poll implementation). */
+ continue;
+ }
+
/* Thread quit pipe has been closed. Killing thread. */
ret = sessiond_check_thread_quit_pipe(pollfd, revents);
if (ret) {