X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fclient.c;h=e381514e063d39e6b2a75abe9762bc95248af62a;hp=ae027d5e0d35a1b7bddb4b391d6feeb12aceb27a;hb=refs%2Fheads%2Fsow-2019-0002-rev1;hpb=55c9e7cac24318259d4f2549c97f7577b7b52db4 diff --git a/src/bin/lttng-sessiond/client.c b/src/bin/lttng-sessiond/client.c index ae027d5e0..e381514e0 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" @@ -39,6 +30,7 @@ #include "utils.h" #include "manage-consumer.h" #include "clear.h" +#include "agent-thread.h" static bool is_root; @@ -191,7 +183,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; @@ -228,7 +220,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; @@ -541,7 +533,6 @@ static int receive_userspace_probe(struct command_ctx *cmd_ctx, int sock, { int fd, ret; struct lttng_userspace_probe_location *probe_location; - const struct lttng_userspace_probe_location_lookup_method *lookup = NULL; struct lttng_dynamic_buffer probe_location_buffer; struct lttng_buffer_view buffer_view; @@ -601,30 +592,7 @@ static int receive_userspace_probe(struct command_ctx *cmd_ctx, int sock, * Set the file descriptor received from the client through the unix * socket in the probe location. */ - lookup = lttng_userspace_probe_location_get_lookup_method(probe_location); - if (!lookup) { - ret = LTTNG_ERR_PROBE_LOCATION_INVAL; - goto error; - } - - /* - * From the kernel tracer's perspective, all userspace probe event types - * are all the same: a file and an offset. - */ - switch (lttng_userspace_probe_location_lookup_method_get_type(lookup)) { - case LTTNG_USERSPACE_PROBE_LOCATION_LOOKUP_METHOD_TYPE_FUNCTION_ELF: - ret = lttng_userspace_probe_location_function_set_binary_fd( - probe_location, fd); - break; - case LTTNG_USERSPACE_PROBE_LOCATION_LOOKUP_METHOD_TYPE_TRACEPOINT_SDT: - ret = lttng_userspace_probe_location_tracepoint_set_binary_fd( - probe_location, fd); - break; - default: - ret = LTTNG_ERR_PROBE_LOCATION_INVAL; - goto error; - } - + ret = lttng_userspace_probe_location_set_binary_fd(probe_location, fd); if (ret) { ret = LTTNG_ERR_PROBE_LOCATION_INVAL; goto error; @@ -719,6 +687,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock, int ret = LTTNG_OK; int need_tracing_session = 1; int need_domain; + int need_consumerd = 1; DBG("Processing client command %d", cmd_ctx->lsm->cmd_type); @@ -742,19 +711,29 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock, 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: + case LTTNG_LIST_TRIGGERS: need_domain = 0; break; default: need_domain = 1; } + /* Needs a functioning consumerd */ + switch (cmd_ctx->lsm->cmd_type) { + case LTTNG_REGISTER_TRIGGER: + case LTTNG_UNREGISTER_TRIGGER: + need_consumerd = 0; + break; + default: + need_consumerd = 1; + break; + } + if (config.no_kernel && need_domain && cmd_ctx->lsm->domain.type == LTTNG_DOMAIN_KERNEL) { if (!is_root) { @@ -794,6 +773,8 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock, case LTTNG_ROTATE_SESSION: case LTTNG_ROTATION_GET_INFO: case LTTNG_SESSION_LIST_ROTATION_SCHEDULES: + case LTTNG_REGISTER_TRIGGER: + case LTTNG_LIST_TRIGGERS: break; default: /* Setup lttng message with no payload */ @@ -814,6 +795,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock, case LTTNG_SAVE_SESSION: case LTTNG_REGISTER_TRIGGER: case LTTNG_UNREGISTER_TRIGGER: + case LTTNG_LIST_TRIGGERS: need_tracing_session = 0; break; default: @@ -892,7 +874,8 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock, } /* Consumer is in an ERROR state. Report back to client */ - if (uatomic_read(&kernel_consumerd_state) == CONSUMER_ERROR) { + if (need_consumerd && uatomic_read(&kernel_consumerd_state) == + CONSUMER_ERROR) { ret = LTTNG_ERR_NO_KERNCONSUMERD; goto error; } @@ -937,14 +920,21 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock, 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(&ust_consumerd_state) == + CONSUMER_ERROR) { ret = LTTNG_ERR_NO_USTCONSUMERD; goto error; } @@ -1207,98 +1197,139 @@ error_add_context: } case LTTNG_TRACK_ID: { - struct lttng_tracker_id id; + struct lttng_tracker_id *id = NULL; + enum lttng_tracker_id_status status; - memset(&id, 0, sizeof(id)); - id.type = cmd_ctx->lsm->u.id_tracker.id_type; - switch (id.type) { + 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: - id.value = cmd_ctx->lsm->u.id_tracker.u.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; - id.string = zmalloc(var_len); - if (!id.string) { + 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, id.string, var_len); + ret = lttcomm_recv_unix_sock(*sock, string, var_len); if (ret <= 0) { DBG("Nothing received"); *sock_error = 1; - free(id.string); + free(string); + lttng_tracker_id_destroy(id); ret = LTTNG_ERR_INVALID; goto error; } - if (strnlen(id.string, var_len) != var_len - 1) { + if (strnlen(string, var_len) != var_len - 1) { DBG("String received as tracker ID is not NULL-terminated"); - free(id.string); + 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); - free(id.string); + cmd_ctx->lsm->domain.type, id); + lttng_tracker_id_destroy(id); break; } case LTTNG_UNTRACK_ID: { - struct lttng_tracker_id id; + struct lttng_tracker_id *id = NULL; + enum lttng_tracker_id_status status; + + id = lttng_tracker_id_create(); - memset(&id, 0, sizeof(id)); - id.type = cmd_ctx->lsm->u.id_tracker.id_type; - switch (id.type) { + 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: - id.value = cmd_ctx->lsm->u.id_tracker.u.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; - id.string = zmalloc(var_len); - if (!id.string) { + 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, id.string, var_len); + ret = lttcomm_recv_unix_sock(*sock, string, var_len); if (ret <= 0) { DBG("Nothing received"); *sock_error = 1; - free(id.string); + lttng_tracker_id_destroy(id); + free(string); ret = LTTNG_ERR_INVALID; goto error; } - if (strnlen(id.string, var_len) != var_len - 1) { + if (strnlen(string, var_len) != var_len - 1) { DBG("String received as tracker ID is not NULL-terminated"); - free(id.string); + 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); - free(id.string); + cmd_ctx->lsm->domain.type, id); + lttng_tracker_id_destroy(id); break; } case LTTNG_ENABLE_EVENT: @@ -1527,64 +1558,41 @@ error_add_context: case LTTNG_LIST_TRACKER_IDS: { struct lttcomm_tracker_command_header cmd_header; - struct lttng_tracker_id *ids = NULL; - ssize_t nr_ids, i; + struct lttng_tracker_ids *ids = NULL; + enum lttng_tracker_id_status status; + unsigned int nr_ids; struct lttng_dynamic_buffer buf; - nr_ids = cmd_list_tracker_ids( + ret = cmd_list_tracker_ids( cmd_ctx->lsm->u.id_tracker.tracker_type, cmd_ctx->session, cmd_ctx->lsm->domain.type, &ids); - if (nr_ids < 0) { - /* Return value is a negative lttng_error_code. */ - ret = -nr_ids; + if (ret != LTTNG_OK) { goto error; } lttng_dynamic_buffer_init(&buf); - for (i = 0; i < nr_ids; i++) { - struct lttng_tracker_id *id = &ids[i]; - struct lttcomm_tracker_id_header id_hdr; - size_t var_data_len = 0; - - memset(&id_hdr, 0, sizeof(id_hdr)); - id_hdr.type = id->type; - switch (id->type) { - case LTTNG_ID_ALL: - break; - case LTTNG_ID_VALUE: - id_hdr.u.value = id->value; - break; - case LTTNG_ID_STRING: - id_hdr.u.var_data_len = var_data_len = - strlen(id->string) + 1; - break; - default: - ret = LTTNG_ERR_INVALID; - goto error; - } - ret = lttng_dynamic_buffer_append( - &buf, &id_hdr, sizeof(id_hdr)); - if (ret) { - ret = LTTNG_ERR_NOMEM; - goto error; - } - ret = lttng_dynamic_buffer_append( - &buf, id->string, var_data_len); - if (ret) { - ret = LTTNG_ERR_NOMEM; - goto error; - } - free(id->string); + + 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)); - free(ids); + error_list_tracker: + lttng_tracker_ids_destroy(ids); lttng_dynamic_buffer_reset(&buf); if (ret < 0) { - goto setup_error; + goto error; } ret = LTTNG_OK; @@ -1948,8 +1956,33 @@ error_add_context: } case LTTNG_REGISTER_TRIGGER: { + struct lttng_dynamic_buffer payload; + struct lttng_trigger *return_trigger; + + lttng_dynamic_buffer_init(&payload); ret = cmd_register_trigger(cmd_ctx, *sock, - notification_thread_handle); + notification_thread_handle, &return_trigger); + if (ret != LTTNG_OK) { + goto error; + } + + ret = lttng_trigger_serialize(return_trigger, &payload, NULL); + if (ret) { + ERR("Failed to serialize trigger in reply to \"register trigger\" command"); + ret = LTTNG_ERR_NOMEM; + lttng_trigger_destroy(return_trigger); + goto error; + } + ret = setup_lttng_msg_no_cmd_header(cmd_ctx, payload.data, + payload.size); + if (ret) { + lttng_trigger_destroy(return_trigger); + ret = LTTNG_ERR_NOMEM; + goto error; + } + lttng_trigger_destroy(return_trigger); + lttng_dynamic_buffer_reset(&payload); + ret = LTTNG_OK; break; } case LTTNG_UNREGISTER_TRIGGER: @@ -2062,6 +2095,37 @@ error_add_context: ret = cmd_clear_session(cmd_ctx->session, sock); break; } + case LTTNG_LIST_TRIGGERS: + { + struct lttng_dynamic_buffer payload; + struct lttng_triggers *return_triggers; + + lttng_dynamic_buffer_init(&payload); + ret = cmd_list_triggers(cmd_ctx, *sock, + notification_thread_handle, &return_triggers); + if (ret != LTTNG_OK) { + goto error; + } + + ret = lttng_triggers_serialize(return_triggers, &payload); + if (ret) { + ERR("Failed to serialize triggers in reply to \"list triggers\" command"); + ret = LTTNG_ERR_NOMEM; + lttng_triggers_destroy(return_triggers); + goto error; + } + ret = setup_lttng_msg_no_cmd_header(cmd_ctx, payload.data, + payload.size); + if (ret) { + ret = LTTNG_ERR_NOMEM; + lttng_triggers_destroy(return_triggers); + goto error; + } + lttng_dynamic_buffer_reset(&payload); + lttng_triggers_destroy(return_triggers); + ret = LTTNG_OK; + break; + } default: ret = LTTNG_ERR_UND; break;