/*
- * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
- * Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- * 2013 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2013 Jérémie Galarneau <jeremie.galarneau@efficios.com>
*
- * 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 <stddef.h>
#include <lttng/event-internal.h>
#include <lttng/session-internal.h>
#include <lttng/session-descriptor-internal.h>
+#include <lttng/tracker-internal.h>
#include "client.h"
#include "lttng-sessiond.h"
}
case LTTNG_TRACK_ID:
{
- struct lttng_tracker_id id;
+ 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;
+ }
- 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) {
+ 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:
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;
projects / lttng-tools.git / blobdiff