#include "common/buffer-view.h"
#include "common/compat/socket.h"
-#include "common/dynamic-buffer.h"
#include "common/dynamic-array.h"
-#include "common/payload.h"
-#include "common/payload-view.h"
+#include "common/dynamic-buffer.h"
#include "common/fd-handle.h"
-#include "common/sessiond-comm/sessiond-comm.h"
-#include "common/payload.h"
#include "common/payload-view.h"
+#include "common/payload.h"
+#include "common/sessiond-comm/sessiond-comm.h"
#include "lttng/lttng-error.h"
#include "lttng/tracker.h"
#include <common/compat/getenv.h>
#include <common/tracker.h>
#include <common/unix.h>
#include <common/utils.h>
+#include <lttng/error-query-internal.h>
#include <lttng/event-internal.h>
#include <lttng/session-descriptor-internal.h>
#include <lttng/session-internal.h>
#include <signal.h>
#include <stddef.h>
#include <sys/stat.h>
+#include <unistd.h>
+#include "agent-thread.h"
+#include "clear.h"
#include "client.h"
-#include "lttng-sessiond.h"
#include "cmd.h"
+#include "health-sessiond.h"
#include "kernel.h"
+#include "lttng-sessiond.h"
+#include "manage-consumer.h"
#include "save.h"
-#include "health-sessiond.h"
#include "testpoint.h"
#include "utils.h"
-#include "manage-consumer.h"
-#include "clear.h"
static bool is_root;
};
struct lttcomm_lttng_msg *p_llm;
- assert(cmd_ctx->reply_payload.buffer.size >= sizeof(llm));
+ LTTNG_ASSERT(cmd_ctx->reply_payload.buffer.size >= sizeof(llm));
p_llm = (typeof(p_llm)) cmd_ctx->reply_payload.buffer.data;
/*
* Exec consumerd.
*/
- if (config.verbose_consumer) {
+ if (the_config.verbose_consumer) {
verbosity = "--verbose";
} else if (lttng_opt_quiet) {
verbosity = "--quiet";
* fallback on the 32-bit one,
*/
DBG3("Looking for a kernel consumer at these locations:");
- DBG3(" 1) %s", config.consumerd64_bin_path.value ? : "NULL");
+ DBG3(" 1) %s", the_config.consumerd64_bin_path.value ? : "NULL");
DBG3(" 2) %s/%s", INSTALL_BIN_PATH, DEFAULT_CONSUMERD_FILE);
- DBG3(" 3) %s", config.consumerd32_bin_path.value ? : "NULL");
- if (stat(config.consumerd64_bin_path.value, &st) == 0) {
+ DBG3(" 3) %s", the_config.consumerd32_bin_path.value ? : "NULL");
+ if (stat(the_config.consumerd64_bin_path.value, &st) == 0) {
DBG3("Found location #1");
- consumer_to_use = config.consumerd64_bin_path.value;
+ consumer_to_use = the_config.consumerd64_bin_path.value;
} else if (stat(INSTALL_BIN_PATH "/" DEFAULT_CONSUMERD_FILE, &st) == 0) {
DBG3("Found location #2");
consumer_to_use = INSTALL_BIN_PATH "/" DEFAULT_CONSUMERD_FILE;
- } else if (config.consumerd32_bin_path.value &&
- stat(config.consumerd32_bin_path.value, &st) == 0) {
+ } else if (the_config.consumerd32_bin_path.value &&
+ stat(the_config.consumerd32_bin_path.value, &st) == 0) {
DBG3("Found location #3");
- consumer_to_use = config.consumerd32_bin_path.value;
+ consumer_to_use = the_config.consumerd32_bin_path.value;
} else {
DBG("Could not find any valid consumerd executable");
ret = -EINVAL;
goto error;
}
DBG("Using kernel consumer at: %s", consumer_to_use);
- (void) execl(consumer_to_use,
- "lttng-consumerd", verbosity, "-k",
- "--consumerd-cmd-sock", consumer_data->cmd_unix_sock_path,
- "--consumerd-err-sock", consumer_data->err_unix_sock_path,
- "--group", config.tracing_group_name.value,
- NULL);
+ (void) execl(consumer_to_use, "lttng-consumerd",
+ verbosity, "-k", "--consumerd-cmd-sock",
+ consumer_data->cmd_unix_sock_path,
+ "--consumerd-err-sock",
+ consumer_data->err_unix_sock_path,
+ "--group",
+ the_config.tracing_group_name.value,
+ NULL);
break;
case LTTNG_CONSUMER64_UST:
{
- if (config.consumerd64_lib_dir.value) {
+ if (the_config.consumerd64_lib_dir.value) {
const char *tmp;
size_t tmplen;
char *tmpnew;
if (!tmp) {
tmp = "";
}
- tmplen = strlen(config.consumerd64_lib_dir.value) + 1 /* : */ + strlen(tmp);
+ tmplen = strlen(the_config.consumerd64_lib_dir.value) + 1 /* : */ + strlen(tmp);
tmpnew = zmalloc(tmplen + 1 /* \0 */);
if (!tmpnew) {
ret = -ENOMEM;
goto error;
}
- strcat(tmpnew, config.consumerd64_lib_dir.value);
+ strcat(tmpnew, the_config.consumerd64_lib_dir.value);
if (tmp[0] != '\0') {
strcat(tmpnew, ":");
strcat(tmpnew, tmp);
goto error;
}
}
- DBG("Using 64-bit UST consumer at: %s", config.consumerd64_bin_path.value);
- (void) execl(config.consumerd64_bin_path.value, "lttng-consumerd", verbosity, "-u",
- "--consumerd-cmd-sock", consumer_data->cmd_unix_sock_path,
- "--consumerd-err-sock", consumer_data->err_unix_sock_path,
- "--group", config.tracing_group_name.value,
+ DBG("Using 64-bit UST consumer at: %s",
+ the_config.consumerd64_bin_path.value);
+ (void) execl(the_config.consumerd64_bin_path.value,
+ "lttng-consumerd", verbosity, "-u",
+ "--consumerd-cmd-sock",
+ consumer_data->cmd_unix_sock_path,
+ "--consumerd-err-sock",
+ consumer_data->err_unix_sock_path,
+ "--group",
+ the_config.tracing_group_name.value,
NULL);
break;
}
case LTTNG_CONSUMER32_UST:
{
- if (config.consumerd32_lib_dir.value) {
+ if (the_config.consumerd32_lib_dir.value) {
const char *tmp;
size_t tmplen;
char *tmpnew;
if (!tmp) {
tmp = "";
}
- tmplen = strlen(config.consumerd32_lib_dir.value) + 1 /* : */ + strlen(tmp);
+ tmplen = strlen(the_config.consumerd32_lib_dir.value) + 1 /* : */ + strlen(tmp);
tmpnew = zmalloc(tmplen + 1 /* \0 */);
if (!tmpnew) {
ret = -ENOMEM;
goto error;
}
- strcat(tmpnew, config.consumerd32_lib_dir.value);
+ strcat(tmpnew, the_config.consumerd32_lib_dir.value);
if (tmp[0] != '\0') {
strcat(tmpnew, ":");
strcat(tmpnew, tmp);
goto error;
}
}
- DBG("Using 32-bit UST consumer at: %s", config.consumerd32_bin_path.value);
- (void) execl(config.consumerd32_bin_path.value, "lttng-consumerd", verbosity, "-u",
- "--consumerd-cmd-sock", consumer_data->cmd_unix_sock_path,
- "--consumerd-err-sock", consumer_data->err_unix_sock_path,
- "--group", config.tracing_group_name.value,
+ DBG("Using 32-bit UST consumer at: %s",
+ the_config.consumerd32_bin_path.value);
+ (void) execl(the_config.consumerd32_bin_path.value,
+ "lttng-consumerd", verbosity, "-u",
+ "--consumerd-cmd-sock",
+ consumer_data->cmd_unix_sock_path,
+ "--consumerd-err-sock",
+ consumer_data->err_unix_sock_path,
+ "--group",
+ the_config.tracing_group_name.value,
NULL);
break;
}
const char *dir_name;
struct consumer_output *consumer;
- assert(session);
- assert(session->consumer);
+ LTTNG_ASSERT(session);
+ LTTNG_ASSERT(session->consumer);
switch (domain) {
case LTTNG_DOMAIN_KERNEL:
int ret;
struct ltt_ust_session *lus = NULL;
- assert(session);
- assert(domain);
- assert(session->consumer);
+ LTTNG_ASSERT(session);
+ LTTNG_ASSERT(domain);
+ LTTNG_ASSERT(session->consumer);
switch (domain->type) {
case LTTNG_DOMAIN_JUL:
}
/* Code flow safety */
- assert(session->kernel_session);
+ LTTNG_ASSERT(session->kernel_session);
/* Copy session output to the newly created Kernel session */
ret = copy_session_consumer(LTTNG_DOMAIN_KERNEL, session);
struct ltt_session *session;
const struct ltt_session_list *session_list = session_get_list();
- DBG("Counting number of available session for UID %d GID %d",
- uid, gid);
+ DBG("Counting number of available session for UID %d", uid);
cds_list_for_each_entry(session, &session_list->head, list) {
if (!session_get(session)) {
continue;
}
session_lock(session);
/* Only count the sessions the user can control. */
- if (session_access_ok(session, uid, gid) &&
+ if (session_access_ok(session, uid) &&
!session->destroyed) {
i++;
}
return ret;
}
+static enum lttng_error_code receive_lttng_trigger(struct command_ctx *cmd_ctx,
+ int sock,
+ int *sock_error,
+ struct lttng_trigger **_trigger)
+{
+ int ret;
+ size_t trigger_len;
+ ssize_t sock_recv_len;
+ enum lttng_error_code ret_code;
+ struct lttng_payload trigger_payload;
+ struct lttng_trigger *trigger = NULL;
+
+ lttng_payload_init(&trigger_payload);
+ trigger_len = (size_t) cmd_ctx->lsm.u.trigger.length;
+ ret = lttng_dynamic_buffer_set_size(
+ &trigger_payload.buffer, trigger_len);
+ if (ret) {
+ ret_code = LTTNG_ERR_NOMEM;
+ goto end;
+ }
+
+ sock_recv_len = lttcomm_recv_unix_sock(
+ sock, trigger_payload.buffer.data, trigger_len);
+ if (sock_recv_len < 0 || sock_recv_len != trigger_len) {
+ ERR("Failed to receive trigger in command payload");
+ *sock_error = 1;
+ ret_code = LTTNG_ERR_INVALID_PROTOCOL;
+ goto end;
+ }
+
+ /* Receive fds, if any. */
+ if (cmd_ctx->lsm.fd_count > 0) {
+ sock_recv_len = lttcomm_recv_payload_fds_unix_sock(
+ sock, cmd_ctx->lsm.fd_count, &trigger_payload);
+ if (sock_recv_len > 0 &&
+ sock_recv_len != cmd_ctx->lsm.fd_count * sizeof(int)) {
+ ERR("Failed to receive all file descriptors for trigger in command payload: expected fd count = %u, ret = %d",
+ cmd_ctx->lsm.fd_count, (int) ret);
+ ret_code = LTTNG_ERR_INVALID_PROTOCOL;
+ *sock_error = 1;
+ goto end;
+ } else if (sock_recv_len <= 0) {
+ ERR("Failed to receive file descriptors for trigger in command payload: expected fd count = %u, ret = %d",
+ cmd_ctx->lsm.fd_count, (int) ret);
+ ret_code = LTTNG_ERR_FATAL;
+ *sock_error = 1;
+ goto end;
+ }
+ }
+
+ /* Deserialize trigger. */
+ {
+ struct lttng_payload_view view =
+ lttng_payload_view_from_payload(
+ &trigger_payload, 0, -1);
+
+ if (lttng_trigger_create_from_payload(&view, &trigger) !=
+ trigger_len) {
+ ERR("Invalid trigger received as part of command payload");
+ ret_code = LTTNG_ERR_INVALID_TRIGGER;
+ lttng_trigger_put(trigger);
+ goto end;
+ }
+ }
+
+ *_trigger = trigger;
+ ret_code = LTTNG_OK;
+
+end:
+ lttng_payload_reset(&trigger_payload);
+ return ret_code;
+}
+
+static enum lttng_error_code receive_lttng_error_query(struct command_ctx *cmd_ctx,
+ int sock,
+ int *sock_error,
+ struct lttng_error_query **_query)
+{
+ int ret;
+ size_t query_len;
+ ssize_t sock_recv_len;
+ enum lttng_error_code ret_code;
+ struct lttng_payload query_payload;
+ struct lttng_error_query *query = NULL;
+
+ lttng_payload_init(&query_payload);
+ query_len = (size_t) cmd_ctx->lsm.u.error_query.length;
+ ret = lttng_dynamic_buffer_set_size(&query_payload.buffer, query_len);
+ if (ret) {
+ ret_code = LTTNG_ERR_NOMEM;
+ goto end;
+ }
+
+ sock_recv_len = lttcomm_recv_unix_sock(
+ sock, query_payload.buffer.data, query_len);
+ if (sock_recv_len < 0 || sock_recv_len != query_len) {
+ ERR("Failed to receive error query in command payload");
+ *sock_error = 1;
+ ret_code = LTTNG_ERR_INVALID_PROTOCOL;
+ goto end;
+ }
+
+ /* Receive fds, if any. */
+ if (cmd_ctx->lsm.fd_count > 0) {
+ sock_recv_len = lttcomm_recv_payload_fds_unix_sock(
+ sock, cmd_ctx->lsm.fd_count, &query_payload);
+ if (sock_recv_len > 0 &&
+ sock_recv_len != cmd_ctx->lsm.fd_count * sizeof(int)) {
+ ERR("Failed to receive all file descriptors for error query in command payload: expected fd count = %u, ret = %d",
+ cmd_ctx->lsm.fd_count, (int) ret);
+ ret_code = LTTNG_ERR_INVALID_PROTOCOL;
+ *sock_error = 1;
+ goto end;
+ } else if (sock_recv_len <= 0) {
+ ERR("Failed to receive file descriptors for error query in command payload: expected fd count = %u, ret = %d",
+ cmd_ctx->lsm.fd_count, (int) ret);
+ ret_code = LTTNG_ERR_FATAL;
+ *sock_error = 1;
+ goto end;
+ }
+ }
+
+ /* Deserialize error query. */
+ {
+ struct lttng_payload_view view =
+ lttng_payload_view_from_payload(
+ &query_payload, 0, -1);
+
+ if (lttng_error_query_create_from_payload(&view, &query) !=
+ query_len) {
+ ERR("Invalid error query received as part of command payload");
+ ret_code = LTTNG_ERR_INVALID_PROTOCOL;
+ goto end;
+ }
+ }
+
+ *_query = query;
+ ret_code = LTTNG_OK;
+
+end:
+ lttng_payload_reset(&query_payload);
+ return ret_code;
+}
+
/*
* Version of setup_lttng_msg() without command header.
*/
{
int ret = 1;
- if (kernel_tracer_version.major != 2 || kernel_tracer_version.minor < 11) {
+ if (the_kernel_tracer_version.major != 2 ||
+ the_kernel_tracer_version.minor < 11) {
DBG("Kernel tracer version is not compatible with the rotation feature");
ret = 0;
}
int *sock_error)
{
int ret = LTTNG_OK;
- int need_tracing_session = 1;
- int need_domain;
+ bool need_tracing_session = true;
+ bool need_domain;
+ bool need_consumerd;
- DBG("Processing client command %d", cmd_ctx->lsm.cmd_type);
+ DBG("Processing client command '%s\' (%d)",
+ lttcomm_sessiond_command_str(cmd_ctx->lsm.cmd_type),
+ cmd_ctx->lsm.cmd_type);
- assert(!rcu_read_ongoing());
+ LTTNG_ASSERT(!rcu_read_ongoing());
*sock_error = 0;
case LTTNG_SET_SESSION_SHM_PATH:
case LTTNG_REGENERATE_METADATA:
case LTTNG_REGENERATE_STATEDUMP:
- case LTTNG_REGISTER_TRIGGER:
- case LTTNG_UNREGISTER_TRIGGER:
case LTTNG_ROTATE_SESSION:
case LTTNG_ROTATION_GET_INFO:
case LTTNG_ROTATION_SET_SCHEDULE:
case LTTNG_SESSION_LIST_ROTATION_SCHEDULES:
case LTTNG_CLEAR_SESSION:
- need_domain = 0;
+ case LTTNG_LIST_TRIGGERS:
+ case LTTNG_EXECUTE_ERROR_QUERY:
+ need_domain = false;
+ break;
+ default:
+ need_domain = true;
+ }
+
+ /* Needs a functioning consumerd? */
+ switch (cmd_ctx->lsm.cmd_type) {
+ case LTTNG_REGISTER_TRIGGER:
+ case LTTNG_UNREGISTER_TRIGGER:
+ case LTTNG_EXECUTE_ERROR_QUERY:
+ need_consumerd = false;
break;
default:
- need_domain = 1;
+ need_consumerd = true;
+ break;
}
- if (config.no_kernel && need_domain
- && cmd_ctx->lsm.domain.type == LTTNG_DOMAIN_KERNEL) {
+ if (the_config.no_kernel && need_domain &&
+ cmd_ctx->lsm.domain.type == LTTNG_DOMAIN_KERNEL) {
if (!is_root) {
ret = LTTNG_ERR_NEED_ROOT_SESSIOND;
} else {
/* Deny register consumer if we already have a spawned consumer. */
if (cmd_ctx->lsm.cmd_type == LTTNG_REGISTER_CONSUMER) {
- pthread_mutex_lock(&kconsumer_data.pid_mutex);
- if (kconsumer_data.pid > 0) {
+ pthread_mutex_lock(&the_kconsumer_data.pid_mutex);
+ if (the_kconsumer_data.pid > 0) {
ret = LTTNG_ERR_KERN_CONSUMER_FAIL;
- pthread_mutex_unlock(&kconsumer_data.pid_mutex);
+ pthread_mutex_unlock(&the_kconsumer_data.pid_mutex);
goto error;
}
- pthread_mutex_unlock(&kconsumer_data.pid_mutex);
+ pthread_mutex_unlock(&the_kconsumer_data.pid_mutex);
}
/*
case LTTNG_DATA_PENDING:
case LTTNG_ROTATE_SESSION:
case LTTNG_ROTATION_GET_INFO:
+ case LTTNG_REGISTER_TRIGGER:
+ case LTTNG_LIST_TRIGGERS:
+ case LTTNG_EXECUTE_ERROR_QUERY:
break;
default:
/* Setup lttng message with no payload */
case LTTNG_SAVE_SESSION:
case LTTNG_REGISTER_TRIGGER:
case LTTNG_UNREGISTER_TRIGGER:
- need_tracing_session = 0;
+ case LTTNG_LIST_TRIGGERS:
+ case LTTNG_EXECUTE_ERROR_QUERY:
+ need_tracing_session = false;
break;
default:
DBG("Getting session %s by name", cmd_ctx->lsm.session.name);
}
/* Consumer is in an ERROR state. Report back to client */
- if (uatomic_read(&kernel_consumerd_state) == CONSUMER_ERROR) {
+ if (need_consumerd && uatomic_read(&the_kernel_consumerd_state) ==
+ CONSUMER_ERROR) {
ret = LTTNG_ERR_NO_KERNCONSUMERD;
goto error;
}
}
/* Start the kernel consumer daemon */
- pthread_mutex_lock(&kconsumer_data.pid_mutex);
- if (kconsumer_data.pid == 0 &&
+ pthread_mutex_lock(&the_kconsumer_data.pid_mutex);
+ if (the_kconsumer_data.pid == 0 &&
cmd_ctx->lsm.cmd_type != LTTNG_REGISTER_CONSUMER) {
- pthread_mutex_unlock(&kconsumer_data.pid_mutex);
- ret = start_consumerd(&kconsumer_data);
+ pthread_mutex_unlock(&the_kconsumer_data.pid_mutex);
+ ret = start_consumerd(&the_kconsumer_data);
if (ret < 0) {
ret = LTTNG_ERR_KERN_CONSUMER_FAIL;
goto error;
}
- uatomic_set(&kernel_consumerd_state, CONSUMER_STARTED);
+ uatomic_set(&the_kernel_consumerd_state, CONSUMER_STARTED);
} else {
- pthread_mutex_unlock(&kconsumer_data.pid_mutex);
+ pthread_mutex_unlock(&the_kconsumer_data.pid_mutex);
}
/*
* The consumer was just spawned so we need to add the socket to
* the consumer output of the session if exist.
*/
- ret = consumer_create_socket(&kconsumer_data,
+ ret = consumer_create_socket(&the_kconsumer_data,
cmd_ctx->session->kernel_session->consumer);
if (ret < 0) {
goto error;
case LTTNG_DOMAIN_JUL:
case LTTNG_DOMAIN_LOG4J:
case LTTNG_DOMAIN_PYTHON:
+ if (!agent_tracing_is_enabled()) {
+ ret = LTTNG_ERR_AGENT_TRACING_DISABLED;
+ goto error;
+ }
+ /* Fallthrough */
case LTTNG_DOMAIN_UST:
{
if (!ust_app_supported()) {
ret = LTTNG_ERR_NO_UST;
goto error;
}
+
/* Consumer is in an ERROR state. Report back to client */
- if (uatomic_read(&ust_consumerd_state) == CONSUMER_ERROR) {
+ if (need_consumerd &&
+ uatomic_read(&the_ust_consumerd_state) ==
+ CONSUMER_ERROR) {
ret = LTTNG_ERR_NO_USTCONSUMERD;
goto error;
}
/* Start the UST consumer daemons */
/* 64-bit */
- pthread_mutex_lock(&ustconsumer64_data.pid_mutex);
- if (config.consumerd64_bin_path.value &&
- ustconsumer64_data.pid == 0 &&
+ pthread_mutex_lock(&the_ustconsumer64_data.pid_mutex);
+ if (the_config.consumerd64_bin_path.value &&
+ the_ustconsumer64_data.pid == 0 &&
cmd_ctx->lsm.cmd_type != LTTNG_REGISTER_CONSUMER) {
- pthread_mutex_unlock(&ustconsumer64_data.pid_mutex);
- ret = start_consumerd(&ustconsumer64_data);
+ pthread_mutex_unlock(&the_ustconsumer64_data.pid_mutex);
+ ret = start_consumerd(&the_ustconsumer64_data);
if (ret < 0) {
ret = LTTNG_ERR_UST_CONSUMER64_FAIL;
- uatomic_set(&ust_consumerd64_fd, -EINVAL);
+ uatomic_set(&the_ust_consumerd64_fd, -EINVAL);
goto error;
}
- uatomic_set(&ust_consumerd64_fd, ustconsumer64_data.cmd_sock);
- uatomic_set(&ust_consumerd_state, CONSUMER_STARTED);
+ uatomic_set(&the_ust_consumerd64_fd, the_ustconsumer64_data.cmd_sock);
+ uatomic_set(&the_ust_consumerd_state, CONSUMER_STARTED);
} else {
- pthread_mutex_unlock(&ustconsumer64_data.pid_mutex);
+ pthread_mutex_unlock(&the_ustconsumer64_data.pid_mutex);
}
/*
* Setup socket for consumer 64 bit. No need for atomic access
* since it was set above and can ONLY be set in this thread.
*/
- ret = consumer_create_socket(&ustconsumer64_data,
+ ret = consumer_create_socket(&the_ustconsumer64_data,
cmd_ctx->session->ust_session->consumer);
if (ret < 0) {
goto error;
}
/* 32-bit */
- pthread_mutex_lock(&ustconsumer32_data.pid_mutex);
- if (config.consumerd32_bin_path.value &&
- ustconsumer32_data.pid == 0 &&
+ pthread_mutex_lock(&the_ustconsumer32_data.pid_mutex);
+ if (the_config.consumerd32_bin_path.value &&
+ the_ustconsumer32_data.pid == 0 &&
cmd_ctx->lsm.cmd_type != LTTNG_REGISTER_CONSUMER) {
- pthread_mutex_unlock(&ustconsumer32_data.pid_mutex);
- ret = start_consumerd(&ustconsumer32_data);
+ pthread_mutex_unlock(&the_ustconsumer32_data.pid_mutex);
+ ret = start_consumerd(&the_ustconsumer32_data);
if (ret < 0) {
ret = LTTNG_ERR_UST_CONSUMER32_FAIL;
- uatomic_set(&ust_consumerd32_fd, -EINVAL);
+ uatomic_set(&the_ust_consumerd32_fd, -EINVAL);
goto error;
}
- uatomic_set(&ust_consumerd32_fd, ustconsumer32_data.cmd_sock);
- uatomic_set(&ust_consumerd_state, CONSUMER_STARTED);
+ uatomic_set(&the_ust_consumerd32_fd, the_ustconsumer32_data.cmd_sock);
+ uatomic_set(&the_ust_consumerd_state, CONSUMER_STARTED);
} else {
- pthread_mutex_unlock(&ustconsumer32_data.pid_mutex);
+ pthread_mutex_unlock(&the_ustconsumer32_data.pid_mutex);
}
/*
* Setup socket for consumer 32 bit. No need for atomic access
* since it was set above and can ONLY be set in this thread.
*/
- ret = consumer_create_socket(&ustconsumer32_data,
+ ret = consumer_create_socket(&the_ustconsumer32_data,
cmd_ctx->session->ust_session->consumer);
if (ret < 0) {
goto error;
case LTTNG_DOMAIN_LOG4J:
case LTTNG_DOMAIN_PYTHON:
case LTTNG_DOMAIN_UST:
- if (uatomic_read(&ust_consumerd_state) != CONSUMER_STARTED) {
+ if (uatomic_read(&the_ust_consumerd_state) != CONSUMER_STARTED) {
ret = LTTNG_ERR_NO_USTCONSUMERD;
goto error;
}
break;
case LTTNG_DOMAIN_KERNEL:
- if (uatomic_read(&kernel_consumerd_state) != CONSUMER_STARTED) {
+ if (uatomic_read(&the_kernel_consumerd_state) != CONSUMER_STARTED) {
ret = LTTNG_ERR_NO_KERNCONSUMERD;
goto error;
}
}
/*
- * Check that the UID or GID match that of the tracing session.
+ * Check that the UID matches that of the tracing session.
* The root user can interact with all sessions.
*/
if (need_tracing_session) {
if (!session_access_ok(cmd_ctx->session,
- LTTNG_SOCK_GET_UID_CRED(&cmd_ctx->creds),
- LTTNG_SOCK_GET_GID_CRED(&cmd_ctx->creds)) ||
+ LTTNG_SOCK_GET_UID_CRED(&cmd_ctx->creds)) ||
cmd_ctx->session->destroyed) {
ret = LTTNG_ERR_EPERM;
goto error;
cmd_ctx->lsm.domain.type,
cmd_ctx->lsm.u.context.channel_name,
ALIGNED_CONST_PTR(cmd_ctx->lsm.u.context.ctx),
- kernel_poll_pipe[1]);
+ the_kernel_poll_pipe[1]);
cmd_ctx->lsm.u.context.ctx.u.app_ctx.provider_name = NULL;
cmd_ctx->lsm.u.context.ctx.u.app_ctx.ctx_name = NULL;
ret = cmd_enable_channel(cmd_ctx->session,
ALIGNED_CONST_PTR(cmd_ctx->lsm.domain),
ALIGNED_CONST_PTR(cmd_ctx->lsm.u.channel.chan),
- kernel_poll_pipe[1]);
+ the_kernel_poll_pipe[1]);
break;
}
case LTTNG_PROCESS_ATTR_TRACKER_ADD_INCLUDE_VALUE:
.value_type;
struct process_attr_value *value;
enum lttng_error_code ret_code;
+ long login_name_max;
+
+ login_name_max = sysconf(_SC_LOGIN_NAME_MAX);
+ if (login_name_max < 0) {
+ PERROR("Failed to get _SC_LOGIN_NAME_MAX system configuration");
+ ret = LTTNG_ERR_INVALID;
+ goto error;
+ }
/* Receive remaining variable length payload if applicable. */
- if (name_len > LOGIN_NAME_MAX) {
+ if (name_len > login_name_max) {
/*
* POSIX mandates user and group names that are at least
* 8 characters long. Note that although shadow-utils
* limit (from bits/utmp.h, UT_NAMESIZE),
* LOGIN_NAME_MAX is defined to 256.
*/
- ERR("Rejecting process attribute tracker value %s as the provided exceeds the maximal allowed length: argument length = %zu, maximal length = %d",
+ ERR("Rejecting process attribute tracker value %s as the provided exceeds the maximal allowed length: argument length = %zu, maximal length = %ld",
add_value ? "addition" : "removal",
- name_len, LOGIN_NAME_MAX);
+ name_len, login_name_max);
ret = LTTNG_ERR_INVALID;
goto error;
}
payload_view = lttng_buffer_view_from_dynamic_buffer(
&payload, 0, name_len);
+ if (name_len > 0 && !lttng_buffer_view_is_valid(&payload_view)) {
+ ret = LTTNG_ERR_INVALID_PROTOCOL;
+ goto error_add_remove_tracker_value;
+ }
+
/*
* Validate the value type and domains are legal for the process
* attribute tracker that is specified and convert the value to
{
struct lttng_event *ev = NULL;
struct lttng_event_exclusion *exclusion = NULL;
- struct lttng_filter_bytecode *bytecode = NULL;
+ struct lttng_bytecode *bytecode = NULL;
char *filter_expression = NULL;
/* Handle exclusion events and receive it from the client. */
cmd_ctx->lsm.u.enable.channel_name,
ev,
filter_expression, bytecode, exclusion,
- kernel_poll_pipe[1]);
+ the_kernel_poll_pipe[1]);
lttng_event_destroy(ev);
break;
}
case LTTNG_DESTROY_SESSION:
{
ret = cmd_destroy_session(cmd_ctx->session,
- notification_thread_handle,
- sock);
+ the_notification_thread_handle, sock);
break;
}
case LTTNG_LIST_DOMAINS:
switch (cmd_ctx->lsm.domain.type) {
case LTTNG_DOMAIN_KERNEL:
- cdata = &kconsumer_data;
+ cdata = &the_kconsumer_data;
break;
default:
ret = LTTNG_ERR_UND;
goto error;
}
- assert((nb_output > 0 && outputs) || nb_output == 0);
+ LTTNG_ASSERT((nb_output > 0 && outputs) || nb_output == 0);
ret = setup_lttng_msg_no_cmd_header(cmd_ctx, outputs,
nb_output * sizeof(struct lttng_snapshot_output));
free(outputs);
}
case LTTNG_REGISTER_TRIGGER:
{
- ret = cmd_register_trigger(cmd_ctx, *sock,
- notification_thread_handle);
+ struct lttng_trigger *payload_trigger;
+ struct lttng_trigger *return_trigger;
+ size_t original_reply_payload_size;
+ size_t reply_payload_size;
+ const struct lttng_credentials cmd_creds = {
+ .uid = LTTNG_OPTIONAL_INIT_VALUE(cmd_ctx->creds.uid),
+ .gid = LTTNG_OPTIONAL_INIT_VALUE(cmd_ctx->creds.gid),
+ };
+
+ ret = setup_empty_lttng_msg(cmd_ctx);
+ if (ret) {
+ ret = LTTNG_ERR_NOMEM;
+ goto setup_error;
+ }
+
+ ret = receive_lttng_trigger(
+ cmd_ctx, *sock, sock_error, &payload_trigger);
+ if (ret != LTTNG_OK) {
+ goto error;
+ }
+
+ original_reply_payload_size = cmd_ctx->reply_payload.buffer.size;
+
+ ret = cmd_register_trigger(&cmd_creds, payload_trigger,
+ cmd_ctx->lsm.u.trigger.is_trigger_anonymous,
+ the_notification_thread_handle,
+ &return_trigger);
+ if (ret != LTTNG_OK) {
+ lttng_trigger_put(payload_trigger);
+ goto error;
+ }
+
+ ret = lttng_trigger_serialize(return_trigger, &cmd_ctx->reply_payload);
+ lttng_trigger_put(payload_trigger);
+ lttng_trigger_put(return_trigger);
+ if (ret) {
+ ERR("Failed to serialize trigger in reply to \"register trigger\" command");
+ ret = LTTNG_ERR_NOMEM;
+ goto error;
+ }
+
+ reply_payload_size = cmd_ctx->reply_payload.buffer.size -
+ original_reply_payload_size;
+
+ update_lttng_msg(cmd_ctx, 0, reply_payload_size);
+
+ ret = LTTNG_OK;
break;
}
case LTTNG_UNREGISTER_TRIGGER:
{
- ret = cmd_unregister_trigger(cmd_ctx, *sock,
- notification_thread_handle);
+ struct lttng_trigger *payload_trigger;
+ const struct lttng_credentials cmd_creds = {
+ .uid = LTTNG_OPTIONAL_INIT_VALUE(cmd_ctx->creds.uid),
+ .gid = LTTNG_OPTIONAL_INIT_VALUE(cmd_ctx->creds.gid),
+ };
+
+ ret = receive_lttng_trigger(
+ cmd_ctx, *sock, sock_error, &payload_trigger);
+ if (ret != LTTNG_OK) {
+ goto error;
+ }
+
+ ret = cmd_unregister_trigger(&cmd_creds, payload_trigger,
+ the_notification_thread_handle);
+ lttng_trigger_put(payload_trigger);
break;
}
case LTTNG_ROTATE_SESSION:
schedule_type = (enum lttng_rotation_schedule_type) cmd_ctx->lsm.u.rotation_set_schedule.type;
value = cmd_ctx->lsm.u.rotation_set_schedule.value;
- ret = cmd_rotation_set_schedule(cmd_ctx->session,
- set_schedule,
- schedule_type,
- value,
- notification_thread_handle);
+ ret = cmd_rotation_set_schedule(cmd_ctx->session, set_schedule,
+ schedule_type, value,
+ the_notification_thread_handle);
if (ret != LTTNG_OK) {
goto error;
}
ret = cmd_clear_session(cmd_ctx->session, sock);
break;
}
+ case LTTNG_LIST_TRIGGERS:
+ {
+ struct lttng_triggers *return_triggers = NULL;
+ size_t original_payload_size;
+ size_t payload_size;
+
+ ret = setup_empty_lttng_msg(cmd_ctx);
+ if (ret) {
+ ret = LTTNG_ERR_NOMEM;
+ goto setup_error;
+ }
+
+ original_payload_size = cmd_ctx->reply_payload.buffer.size;
+
+ ret = cmd_list_triggers(cmd_ctx, the_notification_thread_handle,
+ &return_triggers);
+ if (ret != LTTNG_OK) {
+ goto error;
+ }
+
+ LTTNG_ASSERT(return_triggers);
+ ret = lttng_triggers_serialize(
+ return_triggers, &cmd_ctx->reply_payload);
+ lttng_triggers_destroy(return_triggers);
+ if (ret) {
+ ERR("Failed to serialize triggers in reply to `list triggers` command");
+ ret = LTTNG_ERR_NOMEM;
+ goto error;
+ }
+
+ payload_size = cmd_ctx->reply_payload.buffer.size -
+ original_payload_size;
+
+ update_lttng_msg(cmd_ctx, 0, payload_size);
+
+ ret = LTTNG_OK;
+ break;
+ }
+ case LTTNG_EXECUTE_ERROR_QUERY:
+ {
+ struct lttng_error_query *query;
+ const struct lttng_credentials cmd_creds = {
+ .uid = LTTNG_OPTIONAL_INIT_VALUE(cmd_ctx->creds.uid),
+ .gid = LTTNG_OPTIONAL_INIT_VALUE(cmd_ctx->creds.gid),
+ };
+ struct lttng_error_query_results *results = NULL;
+ size_t original_payload_size;
+ size_t payload_size;
+
+ ret = setup_empty_lttng_msg(cmd_ctx);
+ if (ret) {
+ ret = LTTNG_ERR_NOMEM;
+ goto setup_error;
+ }
+
+ original_payload_size = cmd_ctx->reply_payload.buffer.size;
+
+ ret = receive_lttng_error_query(
+ cmd_ctx, *sock, sock_error, &query);
+ if (ret != LTTNG_OK) {
+ goto error;
+ }
+
+ ret = cmd_execute_error_query(&cmd_creds, query, &results,
+ the_notification_thread_handle);
+ lttng_error_query_destroy(query);
+ if (ret != LTTNG_OK) {
+ goto error;
+ }
+
+ LTTNG_ASSERT(results);
+ ret = lttng_error_query_results_serialize(
+ results, &cmd_ctx->reply_payload);
+ lttng_error_query_results_destroy(results);
+ if (ret) {
+ ERR("Failed to serialize error query result set in reply to `execute error query` command");
+ ret = LTTNG_ERR_NOMEM;
+ goto error;
+ }
+
+ payload_size = cmd_ctx->reply_payload.buffer.size -
+ original_payload_size;
+
+ update_lttng_msg(cmd_ctx, 0, payload_size);
+
+ ret = LTTNG_OK;
+
+ break;
+ }
default:
ret = LTTNG_ERR_UND;
break;
session_unlock_list();
}
init_setup_error:
- assert(!rcu_read_ongoing());
+ LTTNG_ASSERT(!rcu_read_ongoing());
return ret;
}
const mode_t old_umask = umask(0);
/* Create client tool unix socket */
- client_sock = lttcomm_create_unix_sock(config.client_unix_sock_path.value);
+ client_sock = lttcomm_create_unix_sock(
+ the_config.client_unix_sock_path.value);
if (client_sock < 0) {
- ERR("Create unix sock failed: %s", config.client_unix_sock_path.value);
+ ERR("Create unix sock failed: %s",
+ the_config.client_unix_sock_path.value);
ret = -1;
goto end;
}
}
/* File permission MUST be 660 */
- ret = chmod(config.client_unix_sock_path.value, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
+ ret = chmod(the_config.client_unix_sock_path.value,
+ S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
if (ret < 0) {
ERR("Set file permissions failed: %s",
- config.client_unix_sock_path.value);
+ the_config.client_unix_sock_path.value);
PERROR("chmod");
(void) lttcomm_close_unix_sock(client_sock);
ret = -1;
rcu_register_thread();
- health_register(health_sessiond, HEALTH_SESSIOND_TYPE_CMD);
+ health_register(the_health_sessiond, HEALTH_SESSIOND_TYPE_CMD);
health_code_update();
continue;
}
+ if (ret < LTTNG_OK || ret >= LTTNG_ERR_NR) {
+ WARN("Command returned an invalid status code, returning unknown error: "
+ "command type = %s (%d), ret = %d",
+ lttcomm_sessiond_command_str(cmd_ctx.lsm.cmd_type),
+ cmd_ctx.lsm.cmd_type, ret);
+ ret = LTTNG_ERR_UNK;
+ }
+
cmd_completion_handler = cmd_pop_completion_handler();
if (cmd_completion_handler) {
enum lttng_error_code completion_code;
struct lttcomm_lttng_msg *llm = (typeof(
llm)) cmd_ctx.reply_payload.buffer.data;
- assert(cmd_ctx.reply_payload.buffer.size >=
- sizeof(llm));
- assert(cmd_ctx.lttng_msg_size == cmd_ctx.reply_payload.buffer.size);
+ LTTNG_ASSERT(cmd_ctx.reply_payload.buffer.size >= sizeof(*llm));
+ LTTNG_ASSERT(cmd_ctx.lttng_msg_size == cmd_ctx.reply_payload.buffer.size);
llm->fd_count = lttng_payload_view_get_fd_handle_count(&view);
error_listen:
error_create_poll:
- unlink(config.client_unix_sock_path.value);
+ unlink(the_config.client_unix_sock_path.value);
ret = close(client_sock);
if (ret) {
PERROR("close");
ERR("Health error occurred in %s", __func__);
}
- health_unregister(health_sessiond);
+ health_unregister(the_health_sessiond);
DBG("Client thread dying");
lttng_payload_reset(&cmd_ctx.reply_payload);