X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fsessiond-trace-chunks.cpp;h=60f1b975453c5612a4b1ee136cc4ce91c37e1fe3;hb=328c2fe7297c941aa9cbcfa4ce944fca1bd7300f;hp=18ef586d00c85d62e5b92bfbc083979dc32e5bf6;hpb=c5c79321eb1937f3d208210365c512f4a186ec2a;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/sessiond-trace-chunks.cpp b/src/bin/lttng-relayd/sessiond-trace-chunks.cpp
index 18ef586d0..60f1b9754 100644
--- a/src/bin/lttng-relayd/sessiond-trace-chunks.cpp
+++ b/src/bin/lttng-relayd/sessiond-trace-chunks.cpp
@@ -5,17 +5,17 @@
  *
  */
 
-#include "sessiond-trace-chunks.h"
+#include "sessiond-trace-chunks.hpp"
 #include <urcu.h>
 #include <urcu/rculfhash.h>
 #include <urcu/ref.h>
-#include <common/macros.h>
-#include <common/hashtable/hashtable.h>
-#include <common/hashtable/utils.h>
-#include <common/trace-chunk-registry.h>
-#include <common/defaults.h>
-#include <common/error.h>
-#include <common/string-utils/format.h>
+#include <common/macros.hpp>
+#include <common/hashtable/hashtable.hpp>
+#include <common/hashtable/utils.hpp>
+#include <common/trace-chunk-registry.hpp>
+#include <common/defaults.hpp>
+#include <common/error.hpp>
+#include <common/string-utils/format.hpp>
 #include <stdio.h>
 #include <inttypes.h>
 
@@ -56,6 +56,7 @@ struct sessiond_trace_chunk_registry {
 	struct cds_lfht *ht;
 };
 
+namespace {
 struct trace_chunk_registry_ht_key {
 	lttng_uuid sessiond_uuid;
 };
@@ -70,13 +71,14 @@ struct trace_chunk_registry_ht_element {
 	struct lttng_trace_chunk_registry *trace_chunk_registry;
 	struct sessiond_trace_chunk_registry *sessiond_trace_chunk_registry;
 };
+} /* namespace */
 
 static
 unsigned long trace_chunk_registry_ht_key_hash(
 		const struct trace_chunk_registry_ht_key *key)
 {
-	uint64_t uuid_h1 = ((uint64_t *) key->sessiond_uuid)[0];
-	uint64_t uuid_h2 = ((uint64_t *) key->sessiond_uuid)[1];
+	const uint64_t uuid_h1 = *reinterpret_cast<const uint64_t *>(&key->sessiond_uuid[0]);
+	const uint64_t uuid_h2 = *reinterpret_cast<const uint64_t *>(&key->sessiond_uuid[1]);
 
 	return hash_key_u64(&uuid_h1, lttng_ht_seed) ^
 			hash_key_u64(&uuid_h2, lttng_ht_seed);
@@ -92,8 +94,7 @@ int trace_chunk_registry_ht_key_match(struct cds_lfht_node *node,
 	struct trace_chunk_registry_ht_element *registry;
 
 	registry = container_of(node, typeof(*registry), ht_node);
-	return lttng_uuid_is_equal(key->sessiond_uuid,
-			registry->key.sessiond_uuid);
+	return key->sessiond_uuid == registry->key.sessiond_uuid;
 }
 
 static
@@ -197,7 +198,7 @@ int trace_chunk_registry_ht_element_create(
 		goto end;
 	}
 
-	new_element = (trace_chunk_registry_ht_element *) zmalloc(sizeof(*new_element));
+	new_element = zmalloc<trace_chunk_registry_ht_element>();
 	if (!new_element) {
 		ret = -1;
 		goto end;
@@ -263,7 +264,7 @@ end:
 struct sessiond_trace_chunk_registry *sessiond_trace_chunk_registry_create(void)
 {
 	struct sessiond_trace_chunk_registry *sessiond_registry =
-			(sessiond_trace_chunk_registry *) zmalloc(sizeof(*sessiond_registry));
+			zmalloc<sessiond_trace_chunk_registry>();
 
 	if (!sessiond_registry) {
 		goto end;
@@ -293,13 +294,13 @@ void sessiond_trace_chunk_registry_destroy(
 
 int sessiond_trace_chunk_registry_session_created(
 		struct sessiond_trace_chunk_registry *sessiond_registry,
-		const lttng_uuid sessiond_uuid)
+		const lttng_uuid& sessiond_uuid)
 {
 	int ret = 0;
 	struct trace_chunk_registry_ht_key key;
 	struct trace_chunk_registry_ht_element *element;
 
-	lttng_uuid_copy(key.sessiond_uuid, sessiond_uuid);
+	key.sessiond_uuid = sessiond_uuid;
 
 	element = trace_chunk_registry_ht_element_find(sessiond_registry, &key);
 	if (element) {
@@ -319,7 +320,7 @@ end:
 
 int sessiond_trace_chunk_registry_session_destroyed(
 		struct sessiond_trace_chunk_registry *sessiond_registry,
-		const lttng_uuid sessiond_uuid)
+		const lttng_uuid& sessiond_uuid)
 {
 	int ret = 0;
 	struct trace_chunk_registry_ht_key key;
@@ -327,7 +328,7 @@ int sessiond_trace_chunk_registry_session_destroyed(
 	char uuid_str[LTTNG_UUID_STR_LEN];
 
 	lttng_uuid_to_str(sessiond_uuid, uuid_str);
-	lttng_uuid_copy(key.sessiond_uuid, sessiond_uuid);
+	key.sessiond_uuid = sessiond_uuid;
 
 	element = trace_chunk_registry_ht_element_find(sessiond_registry, &key);
 	if (element) {
@@ -349,7 +350,7 @@ int sessiond_trace_chunk_registry_session_destroyed(
 
 struct lttng_trace_chunk *sessiond_trace_chunk_registry_publish_chunk(
 		struct sessiond_trace_chunk_registry *sessiond_registry,
-		const lttng_uuid sessiond_uuid, uint64_t session_id,
+		const lttng_uuid& sessiond_uuid, uint64_t session_id,
 		struct lttng_trace_chunk *new_chunk)
 {
 	enum lttng_trace_chunk_status status;
@@ -363,7 +364,7 @@ struct lttng_trace_chunk *sessiond_trace_chunk_registry_publish_chunk(
 	bool trace_chunk_already_published;
 
 	lttng_uuid_to_str(sessiond_uuid, uuid_str);
-	lttng_uuid_copy(key.sessiond_uuid, sessiond_uuid);
+	key.sessiond_uuid = sessiond_uuid;
 
 	status = lttng_trace_chunk_get_id(new_chunk, &chunk_id);
 	if (status == LTTNG_TRACE_CHUNK_STATUS_OK) {
@@ -426,7 +427,7 @@ end:
 struct lttng_trace_chunk *
 sessiond_trace_chunk_registry_get_anonymous_chunk(
 		struct sessiond_trace_chunk_registry *sessiond_registry,
-		const lttng_uuid sessiond_uuid,
+		const lttng_uuid& sessiond_uuid,
 		uint64_t session_id)
 {
 	struct lttng_trace_chunk *chunk = NULL;
@@ -436,7 +437,7 @@ sessiond_trace_chunk_registry_get_anonymous_chunk(
 
 	lttng_uuid_to_str(sessiond_uuid, uuid_str);
 
-	lttng_uuid_copy(key.sessiond_uuid, sessiond_uuid);
+	key.sessiond_uuid = sessiond_uuid;
 	element = trace_chunk_registry_ht_element_find(sessiond_registry, &key);
 	if (!element) {
 		ERR("Failed to find trace chunk registry of sessiond {%s}",
@@ -455,7 +456,7 @@ end:
 struct lttng_trace_chunk *
 sessiond_trace_chunk_registry_get_chunk(
 		struct sessiond_trace_chunk_registry *sessiond_registry,
-		const lttng_uuid sessiond_uuid,
+		const lttng_uuid& sessiond_uuid,
 		uint64_t session_id, uint64_t chunk_id)
 {
 	struct lttng_trace_chunk *chunk = NULL;
@@ -465,7 +466,7 @@ sessiond_trace_chunk_registry_get_chunk(
 
 	lttng_uuid_to_str(sessiond_uuid, uuid_str);
 
-	lttng_uuid_copy(key.sessiond_uuid, sessiond_uuid);
+	key.sessiond_uuid = sessiond_uuid;
 	element = trace_chunk_registry_ht_element_find(sessiond_registry, &key);
 	if (!element) {
 		ERR("Failed to find trace chunk registry of sessiond {%s}",
@@ -483,14 +484,14 @@ end:
 
 int sessiond_trace_chunk_registry_chunk_exists(
 		struct sessiond_trace_chunk_registry *sessiond_registry,
-		const lttng_uuid sessiond_uuid,
+		const lttng_uuid& sessiond_uuid,
 		uint64_t session_id, uint64_t chunk_id, bool *chunk_exists)
 {
 	int ret;
 	struct trace_chunk_registry_ht_element *element;
 	struct trace_chunk_registry_ht_key key;
 
-	lttng_uuid_copy(key.sessiond_uuid, sessiond_uuid);
+	key.sessiond_uuid = sessiond_uuid;
 	element = trace_chunk_registry_ht_element_find(sessiond_registry, &key);
 	if (!element) {
 		char uuid_str[LTTNG_UUID_STR_LEN];