X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fclient.c;h=ae0e020924b38b1929d97a1857c27eb382d5826a;hb=ab5be9fa2eb5ba9600a82cd18fd3cfcbac69169a;hp=327c1fe1706efabaefdf9dd2a3c5dc7fb4865c3e;hpb=0f68efb616cd046543e5fc5a091466ec26df2216;p=lttng-tools.git diff --git a/src/bin/lttng-sessiond/client.c b/src/bin/lttng-sessiond/client.c index 327c1fe17..ae0e02092 100644 --- a/src/bin/lttng-sessiond/client.c +++ b/src/bin/lttng-sessiond/client.c @@ -1,20 +1,10 @@ /* - * 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 @@ -28,6 +18,7 @@ #include #include #include +#include #include "client.h" #include "lttng-sessiond.h" @@ -38,6 +29,7 @@ #include "testpoint.h" #include "utils.h" #include "manage-consumer.h" +#include "clear.h" static bool is_root; @@ -747,6 +739,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock, case LTTNG_ROTATION_GET_INFO: case LTTNG_ROTATION_SET_SCHEDULE: case LTTNG_SESSION_LIST_ROTATION_SCHEDULES: + case LTTNG_CLEAR_SESSION: need_domain = 0; break; default: @@ -787,7 +780,7 @@ 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_PIDS: + case LTTNG_LIST_TRACKER_IDS: case LTTNG_DATA_PENDING: case LTTNG_ROTATE_SESSION: case LTTNG_ROTATION_GET_INFO: @@ -1203,18 +1196,141 @@ error_add_context: kernel_poll_pipe[1]); break; } - case LTTNG_TRACK_PID: + case LTTNG_TRACK_ID: { - ret = cmd_track_pid(cmd_ctx->session, - cmd_ctx->lsm->domain.type, - cmd_ctx->lsm->u.pid_tracker.pid); + struct lttng_tracker_id *id = NULL; + enum lttng_tracker_id_status status; + + id = lttng_tracker_id_create(); + if (!id) { + ret = LTTNG_ERR_NOMEM; + 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); + ret = LTTNG_ERR_NOMEM; + 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; + 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; + } + + status = lttng_tracker_id_set_string(id, string); + free(string); + break; + } + default: + lttng_tracker_id_destroy(id); + ret = LTTNG_ERR_INVALID; + goto error; + } + + if (status != LTTNG_TRACKER_ID_STATUS_OK) { + ERR("Invalid value for tracker id"); + ret = LTTNG_ERR_INVALID; + lttng_tracker_id_destroy(id); + 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); break; } - case LTTNG_UNTRACK_PID: + case LTTNG_UNTRACK_ID: { - ret = cmd_untrack_pid(cmd_ctx->session, - cmd_ctx->lsm->domain.type, - cmd_ctx->lsm->u.pid_tracker.pid); + 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; + } + default: + lttng_tracker_id_destroy(id); + ret = LTTNG_ERR_INVALID; + goto error; + } + + if (status != LTTNG_TRACKER_ID_STATUS_OK) { + ERR("Invalid tracker id"); + lttng_tracker_id_destroy(id); + ret = LTTNG_ERR_INVALID; + goto error; + } + + 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); break; } case LTTNG_ENABLE_EVENT: @@ -1440,29 +1556,44 @@ error_add_context: ret = LTTNG_OK; break; } - case LTTNG_LIST_TRACKER_PIDS: + case LTTNG_LIST_TRACKER_IDS: { - int32_t *pids = NULL; - ssize_t nr_pids; - - nr_pids = cmd_list_tracker_pids(cmd_ctx->session, - cmd_ctx->lsm->domain.type, &pids); - if (nr_pids < 0) { - /* Return value is a negative lttng_error_code. */ - ret = -nr_pids; + 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; } - /* - * Setup lttng message with payload size set to the event list size in - * bytes and then copy list into the llm payload. - */ - ret = setup_lttng_msg_no_cmd_header(cmd_ctx, pids, - sizeof(int32_t) * nr_pids); - free(pids); + 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 setup_error; + 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; @@ -1850,7 +1981,8 @@ error_add_context: } ret = cmd_rotate_session(cmd_ctx->session, &rotate_return, - false); + false, + LTTNG_TRACE_CHUNK_COMMAND_TYPE_MOVE_TO_COMPLETED); if (ret < 0) { ret = -ret; goto error; @@ -1934,6 +2066,11 @@ error_add_context: ret = LTTNG_OK; break; } + case LTTNG_CLEAR_SESSION: + { + ret = cmd_clear_session(cmd_ctx->session, sock); + break; + } default: ret = LTTNG_ERR_UND; break;