X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fsessiond-trace-chunks.c;h=1065234739a8d6e529c1dc58ba3dde24140c2666;hp=f2dfa23a11826d935ec1e2f189d9bdeef4e6b958;hb=505b2d90aa87592186ecc2a119cf67fb3f90d168;hpb=cd65fb868140e522fa520a4735d81a93038963e9 diff --git a/src/bin/lttng-relayd/sessiond-trace-chunks.c b/src/bin/lttng-relayd/sessiond-trace-chunks.c index f2dfa23a1..106523473 100644 --- a/src/bin/lttng-relayd/sessiond-trace-chunks.c +++ b/src/bin/lttng-relayd/sessiond-trace-chunks.c @@ -1,18 +1,8 @@ /* - * Copyright (C) 2019 - Jérémie Galarneau + * Copyright (C) 2019 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 "sessiond-trace-chunks.h" @@ -120,7 +110,7 @@ void trace_chunk_registry_ht_element_release(struct urcu_ref *ref) { struct trace_chunk_registry_ht_element *element = container_of(ref, typeof(*element), ref); - char uuid_str[UUID_STR_LEN]; + char uuid_str[LTTNG_UUID_STR_LEN]; lttng_uuid_to_str(element->key.sessiond_uuid, uuid_str); @@ -197,7 +187,7 @@ int trace_chunk_registry_ht_element_create( int ret = 0; struct trace_chunk_registry_ht_element *new_element; struct lttng_trace_chunk_registry *trace_chunk_registry; - char uuid_str[UUID_STR_LEN]; + char uuid_str[LTTNG_UUID_STR_LEN]; lttng_uuid_to_str(key->sessiond_uuid, uuid_str); @@ -313,7 +303,7 @@ int sessiond_trace_chunk_registry_session_created( element = trace_chunk_registry_ht_element_find(sessiond_registry, &key); if (element) { - char uuid_str[UUID_STR_LEN]; + char uuid_str[LTTNG_UUID_STR_LEN]; lttng_uuid_to_str(sessiond_uuid, uuid_str); DBG("Acquired reference to trace chunk registry of sessiond {%s}", @@ -334,7 +324,7 @@ int sessiond_trace_chunk_registry_session_destroyed( int ret = 0; struct trace_chunk_registry_ht_key key; struct trace_chunk_registry_ht_element *element; - char uuid_str[UUID_STR_LEN]; + char uuid_str[LTTNG_UUID_STR_LEN]; lttng_uuid_to_str(sessiond_uuid, uuid_str); lttng_uuid_copy(key.sessiond_uuid, sessiond_uuid); @@ -367,7 +357,7 @@ struct lttng_trace_chunk *sessiond_trace_chunk_registry_publish_chunk( bool is_anonymous_chunk; struct trace_chunk_registry_ht_key key; struct trace_chunk_registry_ht_element *element = NULL; - char uuid_str[UUID_STR_LEN]; + char uuid_str[LTTNG_UUID_STR_LEN]; char chunk_id_str[MAX_INT_DEC_LEN(typeof(chunk_id))] = "-1"; struct lttng_trace_chunk *published_chunk = NULL; @@ -375,7 +365,7 @@ struct lttng_trace_chunk *sessiond_trace_chunk_registry_publish_chunk( lttng_uuid_copy(key.sessiond_uuid, sessiond_uuid); status = lttng_trace_chunk_get_id(new_chunk, &chunk_id); - if (status == LTTNG_TRACE_CHUNK_STATUS_OK) { + if (status == LTTNG_TRACE_CHUNK_STATUS_OK) { int ret; ret = snprintf(chunk_id_str, sizeof(chunk_id_str), "%" PRIu64, @@ -385,25 +375,25 @@ struct lttng_trace_chunk *sessiond_trace_chunk_registry_publish_chunk( WARN("Failed to format trace chunk id"); } is_anonymous_chunk = false; - } else if (status == LTTNG_TRACE_CHUNK_STATUS_NONE) { + } else if (status == LTTNG_TRACE_CHUNK_STATUS_NONE) { is_anonymous_chunk = true; } else { ERR("Failed to get trace chunk id"); goto end; } - DBG("Attempting to publish trace chunk: sessiond {%s}, session_id = " + DBG("Attempting to publish trace chunk: sessiond {%s}, session_id = " "%" PRIu64 ", chunk_id = %s", uuid_str, session_id, is_anonymous_chunk ? "anonymous" : chunk_id_str); - element = trace_chunk_registry_ht_element_find(sessiond_registry, &key); + element = trace_chunk_registry_ht_element_find(sessiond_registry, &key); if (!element) { ERR("Failed to find registry of sessiond {%s}", uuid_str); goto end; } - published_chunk = lttng_trace_chunk_registry_publish_chunk( + published_chunk = lttng_trace_chunk_registry_publish_chunk( element->trace_chunk_registry, session_id, new_chunk); /* * At this point, two references to the published chunks exist. One @@ -432,7 +422,7 @@ sessiond_trace_chunk_registry_get_anonymous_chunk( struct lttng_trace_chunk *chunk = NULL; struct trace_chunk_registry_ht_element *element; struct trace_chunk_registry_ht_key key; - char uuid_str[UUID_STR_LEN]; + char uuid_str[LTTNG_UUID_STR_LEN]; lttng_uuid_to_str(sessiond_uuid, uuid_str); @@ -461,7 +451,7 @@ sessiond_trace_chunk_registry_get_chunk( struct lttng_trace_chunk *chunk = NULL; struct trace_chunk_registry_ht_element *element; struct trace_chunk_registry_ht_key key; - char uuid_str[UUID_STR_LEN]; + char uuid_str[LTTNG_UUID_STR_LEN]; lttng_uuid_to_str(sessiond_uuid, uuid_str); @@ -493,7 +483,7 @@ int sessiond_trace_chunk_registry_chunk_exists( lttng_uuid_copy(key.sessiond_uuid, sessiond_uuid); element = trace_chunk_registry_ht_element_find(sessiond_registry, &key); if (!element) { - char uuid_str[UUID_STR_LEN]; + char uuid_str[LTTNG_UUID_STR_LEN]; lttng_uuid_to_str(sessiond_uuid, uuid_str); /*