X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fsessiond-trace-chunks.cpp;h=34f14f187fbe5d615cc0fd849a9fb3855722bced;hb=cfaa204e7ab4317ee1efd1b430ed3ddc2633068a;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..34f14f187 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,6 +71,7 @@ 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(
@@ -197,7 +199,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 +265,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;