X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fclient.c;h=9f9afa25acd1f45d64eb7cd6e7ce5b0b53b571c2;hp=f0b0efd3c3d86d89fee6184087baa896e40d62c4;hb=a2814ea7573bf5edd5323d6f89c48ff14105db69;hpb=f19f5c968f63a83a83c47390020e6ff0dd7c85aa diff --git a/src/bin/lttng-sessiond/client.c b/src/bin/lttng-sessiond/client.c index f0b0efd3c..9f9afa25a 100644 --- a/src/bin/lttng-sessiond/client.c +++ b/src/bin/lttng-sessiond/client.c @@ -1,34 +1,29 @@ /* - * Copyright (C) 2011 - David Goulet - * Mathieu Desnoyers - * 2013 - Jérémie Galarneau + * Copyright (C) 2011 David Goulet + * Copyright (C) 2011 Mathieu Desnoyers + * Copyright (C) 2013 Jérémie Galarneau * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2 only, - * as published by the Free Software Foundation. + * SPDX-License-Identifier: GPL-2.0-only * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include -#include -#include -#include +#include "common/buffer-view.h" +#include "common/dynamic-buffer.h" +#include "common/sessiond-comm/sessiond-comm.h" +#include "lttng/lttng-error.h" +#include "lttng/tracker.h" #include +#include #include #include -#include #include -#include #include -#include +#include +#include +#include +#include +#include +#include #include "client.h" #include "lttng-sessiond.h" @@ -192,7 +187,7 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data) case LTTNG_CONSUMER64_UST: { if (config.consumerd64_lib_dir.value) { - char *tmp; + const char *tmp; size_t tmplen; char *tmpnew; @@ -229,7 +224,7 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data) case LTTNG_CONSUMER32_UST: { if (config.consumerd32_lib_dir.value) { - char *tmp; + const char *tmp; size_t tmplen; char *tmpnew; @@ -500,6 +495,7 @@ static int create_kernel_session(struct ltt_session *session) session->kernel_session->gid = session->gid; session->kernel_session->output_traces = session->output_traces; session->kernel_session->snapshot_mode = session->snapshot_mode; + session->kernel_session->is_live_session = session->live_timer != 0; return LTTNG_OK; @@ -790,11 +786,12 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock, case LTTNG_LIST_CHANNELS: case LTTNG_LIST_EVENTS: case LTTNG_LIST_SYSCALLS: - case LTTNG_LIST_TRACKER_IDS: + case LTTNG_SESSION_LIST_ROTATION_SCHEDULES: + case LTTNG_PROCESS_ATTR_TRACKER_GET_POLICY: + case LTTNG_PROCESS_ATTR_TRACKER_GET_INCLUSION_SET: case LTTNG_DATA_PENDING: case LTTNG_ROTATE_SESSION: case LTTNG_ROTATION_GET_INFO: - case LTTNG_SESSION_LIST_ROTATION_SCHEDULES: break; default: /* Setup lttng message with no payload */ @@ -1206,141 +1203,189 @@ error_add_context: kernel_poll_pipe[1]); break; } - case LTTNG_TRACK_ID: + case LTTNG_PROCESS_ATTR_TRACKER_ADD_INCLUDE_VALUE: + case LTTNG_PROCESS_ATTR_TRACKER_REMOVE_INCLUDE_VALUE: { - struct lttng_tracker_id *id = NULL; - enum lttng_tracker_id_status status; - - id = lttng_tracker_id_create(); - if (!id) { - ret = LTTNG_ERR_NOMEM; + struct lttng_dynamic_buffer payload; + struct lttng_buffer_view payload_view; + const bool add_value = + cmd_ctx->lsm->cmd_type == + LTTNG_PROCESS_ATTR_TRACKER_ADD_INCLUDE_VALUE; + const size_t name_len = + cmd_ctx->lsm->u.process_attr_tracker_add_remove_include_value + .name_len; + const enum lttng_domain_type domain_type = + (enum lttng_domain_type) + cmd_ctx->lsm->domain.type; + const enum lttng_process_attr process_attr = + (enum lttng_process_attr) cmd_ctx->lsm->u + .process_attr_tracker_add_remove_include_value + .process_attr; + const enum lttng_process_attr_value_type value_type = + (enum lttng_process_attr_value_type) cmd_ctx + ->lsm->u + .process_attr_tracker_add_remove_include_value + .value_type; + struct process_attr_value *value; + enum lttng_error_code ret_code; + + /* Receive remaining variable length payload if applicable. */ + if (name_len > LOGIN_NAME_MAX) { + /* + * POSIX mandates user and group names that are at least + * 8 characters long. Note that although shadow-utils + * (useradd, groupaadd, etc.) use 32 chars as their + * 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", + add_value ? "addition" : "removal", + name_len, LOGIN_NAME_MAX); + ret = LTTNG_ERR_INVALID; goto error; } - switch (cmd_ctx->lsm->u.id_tracker.id_type) { - case LTTNG_ID_ALL: - status = lttng_tracker_id_set_all(id); - break; - case LTTNG_ID_VALUE: - status = lttng_tracker_id_set_value( - id, cmd_ctx->lsm->u.id_tracker.u.value); - break; - case LTTNG_ID_STRING: - { - const size_t var_len = cmd_ctx->lsm->u.id_tracker.u.var_len; - char *string = NULL; - - string = zmalloc(var_len); - if (!string) { - lttng_tracker_id_destroy(id); + lttng_dynamic_buffer_init(&payload); + if (name_len != 0) { + /* + * Receive variable payload for user/group name + * arguments. + */ + ret = lttng_dynamic_buffer_set_size(&payload, name_len); + if (ret) { + ERR("Failed to allocate buffer to receive payload of %s process attribute tracker value argument", + add_value ? "add" : "remove"); ret = LTTNG_ERR_NOMEM; - goto error; + goto error_add_remove_tracker_value; } - DBG("Receiving var len tracker id string from client"); - ret = lttcomm_recv_unix_sock(*sock, string, var_len); + + ret = lttcomm_recv_unix_sock( + *sock, payload.data, name_len); if (ret <= 0) { - DBG("Nothing received"); + ERR("Failed to receive payload of %s process attribute tracker value argument", + add_value ? "add" : "remove"); *sock_error = 1; - free(string); - lttng_tracker_id_destroy(id); - ret = LTTNG_ERR_INVALID; - goto error; - } - if (strnlen(string, var_len) != var_len - 1) { - DBG("String received as tracker ID is not NULL-terminated"); - free(string); - lttng_tracker_id_destroy(id); - ret = LTTNG_ERR_INVALID; - goto error; + ret = LTTNG_ERR_INVALID_PROTOCOL; + goto error_add_remove_tracker_value; } + } - status = lttng_tracker_id_set_string(id, string); - free(string); - break; + payload_view = lttng_buffer_view_from_dynamic_buffer( + &payload, 0, name_len); + /* + * Validate the value type and domains are legal for the process + * attribute tracker that is specified and convert the value to + * add/remove to the internal sessiond representation. + */ + ret_code = process_attr_value_from_comm(domain_type, + process_attr, value_type, + &cmd_ctx->lsm->u.process_attr_tracker_add_remove_include_value + .integral_value, + &payload_view, &value); + if (ret_code != LTTNG_OK) { + ret = ret_code; + goto error_add_remove_tracker_value; + } + + if (add_value) { + ret = cmd_process_attr_tracker_inclusion_set_add_value( + cmd_ctx->session, domain_type, + process_attr, value); + } else { + ret = cmd_process_attr_tracker_inclusion_set_remove_value( + cmd_ctx->session, domain_type, + process_attr, value); } - default: - lttng_tracker_id_destroy(id); - ret = LTTNG_ERR_INVALID; + process_attr_value_destroy(value); + error_add_remove_tracker_value: + lttng_dynamic_buffer_reset(&payload); + break; + } + case LTTNG_PROCESS_ATTR_TRACKER_GET_POLICY: + { + enum lttng_tracking_policy tracking_policy; + const enum lttng_domain_type domain_type = + (enum lttng_domain_type) + cmd_ctx->lsm->domain.type; + const enum lttng_process_attr process_attr = + (enum lttng_process_attr) cmd_ctx->lsm->u + .process_attr_tracker_get_tracking_policy + .process_attr; + + ret = cmd_process_attr_tracker_get_tracking_policy( + cmd_ctx->session, domain_type, process_attr, + &tracking_policy); + if (ret != LTTNG_OK) { goto error; } - if (status != LTTNG_TRACKER_ID_STATUS_OK) { - ERR("Invalid value for tracker id"); - ret = LTTNG_ERR_INVALID; - lttng_tracker_id_destroy(id); + ret = setup_lttng_msg_no_cmd_header(cmd_ctx, + &(uint32_t){tracking_policy}, sizeof(uint32_t)); + if (ret < 0) { + ret = LTTNG_ERR_NOMEM; goto error; } - - ret = cmd_track_id(cmd_ctx->session, - cmd_ctx->lsm->u.id_tracker.tracker_type, - cmd_ctx->lsm->domain.type, id); - lttng_tracker_id_destroy(id); + ret = LTTNG_OK; break; } - case LTTNG_UNTRACK_ID: + case LTTNG_PROCESS_ATTR_TRACKER_SET_POLICY: { - struct lttng_tracker_id *id = NULL; - enum lttng_tracker_id_status status; - - id = lttng_tracker_id_create(); - - switch (cmd_ctx->lsm->u.id_tracker.id_type) { - case LTTNG_ID_ALL: - status = lttng_tracker_id_set_all(id); - break; - case LTTNG_ID_VALUE: - status = lttng_tracker_id_set_value( - id, cmd_ctx->lsm->u.id_tracker.u.value); - break; - case LTTNG_ID_STRING: - { - const size_t var_len = cmd_ctx->lsm->u.id_tracker.u.var_len; - char *string = NULL; - - string = zmalloc(var_len); - if (!string) { - ret = LTTNG_ERR_NOMEM; - lttng_tracker_id_destroy(id); - goto error; - } - DBG("Receiving var len tracker id string from client"); - ret = lttcomm_recv_unix_sock(*sock, string, var_len); - if (ret <= 0) { - DBG("Nothing received"); - *sock_error = 1; - lttng_tracker_id_destroy(id); - free(string); - ret = LTTNG_ERR_INVALID; - goto error; - } - if (strnlen(string, var_len) != var_len - 1) { - DBG("String received as tracker ID is not NULL-terminated"); - lttng_tracker_id_destroy(id); - free(string); - ret = LTTNG_ERR_INVALID; - goto error; - } - status = lttng_tracker_id_set_string(id, string); - free(string); - break; + const enum lttng_tracking_policy tracking_policy = + (enum lttng_tracking_policy) cmd_ctx->lsm->u + .process_attr_tracker_set_tracking_policy + .tracking_policy; + const enum lttng_domain_type domain_type = + (enum lttng_domain_type) + cmd_ctx->lsm->domain.type; + const enum lttng_process_attr process_attr = + (enum lttng_process_attr) cmd_ctx->lsm->u + .process_attr_tracker_set_tracking_policy + .process_attr; + + ret = cmd_process_attr_tracker_set_tracking_policy( + cmd_ctx->session, domain_type, process_attr, + tracking_policy); + if (ret != LTTNG_OK) { + goto error; } - default: - lttng_tracker_id_destroy(id); - ret = LTTNG_ERR_INVALID; + break; + } + case LTTNG_PROCESS_ATTR_TRACKER_GET_INCLUSION_SET: + { + struct lttng_process_attr_values *values; + struct lttng_dynamic_buffer reply; + const enum lttng_domain_type domain_type = + (enum lttng_domain_type) + cmd_ctx->lsm->domain.type; + const enum lttng_process_attr process_attr = + (enum lttng_process_attr) cmd_ctx->lsm->u + .process_attr_tracker_get_inclusion_set + .process_attr; + + ret = cmd_process_attr_tracker_get_inclusion_set( + cmd_ctx->session, domain_type, process_attr, + &values); + if (ret != LTTNG_OK) { goto error; } - if (status != LTTNG_TRACKER_ID_STATUS_OK) { - ERR("Invalid tracker id"); - lttng_tracker_id_destroy(id); - ret = LTTNG_ERR_INVALID; - goto error; + lttng_dynamic_buffer_init(&reply); + ret = lttng_process_attr_values_serialize(values, &reply); + if (ret < 0) { + goto error_tracker_get_inclusion_set; } - ret = cmd_untrack_id(cmd_ctx->session, - cmd_ctx->lsm->u.id_tracker.tracker_type, - cmd_ctx->lsm->domain.type, id); - lttng_tracker_id_destroy(id); + ret = setup_lttng_msg_no_cmd_header( + cmd_ctx, reply.data, reply.size); + if (ret < 0) { + ret = LTTNG_ERR_NOMEM; + goto error_tracker_get_inclusion_set; + } + ret = LTTNG_OK; + + error_tracker_get_inclusion_set: + lttng_process_attr_values_destroy(values); + lttng_dynamic_buffer_reset(&reply); break; } case LTTNG_ENABLE_EVENT: @@ -1566,49 +1611,6 @@ error_add_context: ret = LTTNG_OK; break; } - case LTTNG_LIST_TRACKER_IDS: - { - struct lttcomm_tracker_command_header cmd_header; - struct lttng_tracker_ids *ids = NULL; - enum lttng_tracker_id_status status; - unsigned int nr_ids; - struct lttng_dynamic_buffer buf; - - ret = cmd_list_tracker_ids( - cmd_ctx->lsm->u.id_tracker.tracker_type, - cmd_ctx->session, cmd_ctx->lsm->domain.type, - &ids); - if (ret != LTTNG_OK) { - goto error; - } - - lttng_dynamic_buffer_init(&buf); - - status = lttng_tracker_ids_get_count(ids, &nr_ids); - if (status != LTTNG_TRACKER_ID_STATUS_OK) { - ret = -LTTNG_ERR_INVALID; - goto error_list_tracker; - } - - cmd_header.nb_tracker_id = nr_ids; - - ret = lttng_tracker_ids_serialize(ids, &buf); - if (ret < 0) { - goto error_list_tracker; - } - - ret = setup_lttng_msg(cmd_ctx, buf.data, buf.size, &cmd_header, - sizeof(cmd_header)); - error_list_tracker: - lttng_tracker_ids_destroy(ids); - lttng_dynamic_buffer_reset(&buf); - if (ret < 0) { - goto error; - } - - ret = LTTNG_OK; - break; - } case LTTNG_SET_CONSUMER_URI: { size_t nb_uri, len;