X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fsessiond-trace-chunks.c;h=db9f558012a515d580da0af018be39e24f8c22c1;hp=495227226e8a4bcb5f48c62a607ae29e1ce91336;hb=c70636a7342f34e3be68fcf411cf3e3718b8e73f;hpb=6b584c2ece62c620a86cf438bb358a9da7962b7e

diff --git a/src/bin/lttng-relayd/sessiond-trace-chunks.c b/src/bin/lttng-relayd/sessiond-trace-chunks.c
index 495227226..db9f55801 100644
--- a/src/bin/lttng-relayd/sessiond-trace-chunks.c
+++ b/src/bin/lttng-relayd/sessiond-trace-chunks.c
@@ -120,7 +120,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);
 
@@ -151,6 +151,10 @@ static
 void trace_chunk_registry_ht_element_put(
 		struct trace_chunk_registry_ht_element *element)
 {
+	if (!element) {
+		return;
+	}
+
 	urcu_ref_put(&element->ref, trace_chunk_registry_ht_element_release);
 }
 
@@ -193,7 +197,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);
 
@@ -309,7 +313,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}",
@@ -330,7 +334,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);
@@ -363,7 +367,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;
 
@@ -428,7 +432,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);
 
@@ -457,7 +461,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);
 
@@ -489,7 +493,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);
 		/*