X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fctf-trace.cpp;h=826f0e9e48b304ca2a608a37ef7c5542edde8a70;hb=cd9adb8b829564212158943a0d279bb35322ab30;hp=861bcfbb3f7a44c6d055babdc544abc584835dfc;hpb=48b7cdc221a445188d6d9bd08fc1686837e71224;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/ctf-trace.cpp b/src/bin/lttng-relayd/ctf-trace.cpp
index 861bcfbb3..826f0e9e4 100644
--- a/src/bin/lttng-relayd/ctf-trace.cpp
+++ b/src/bin/lttng-relayd/ctf-trace.cpp
@@ -9,21 +9,21 @@
 
 #define _LGPL_SOURCE
 
-#include <common/common.h>
-#include <common/utils.h>
-#include <urcu/rculist.h>
+#include "ctf-trace.hpp"
+#include "lttng-relayd.hpp"
+#include "stream.hpp"
+
+#include <common/common.hpp>
+#include <common/utils.hpp>
 
-#include "ctf-trace.h"
-#include "lttng-relayd.h"
-#include "stream.h"
+#include <urcu/rculist.h>
 
 static uint64_t last_relay_ctf_trace_id;
 static pthread_mutex_t last_relay_ctf_trace_id_lock = PTHREAD_MUTEX_INITIALIZER;
 
 static void rcu_destroy_ctf_trace(struct rcu_head *rcu_head)
 {
-	struct ctf_trace *trace =
-		caa_container_of(rcu_head, struct ctf_trace, rcu_node);
+	struct ctf_trace *trace = lttng::utils::container_of(rcu_head, &ctf_trace::rcu_node);
 
 	free(trace);
 }
@@ -44,16 +44,15 @@ static void ctf_trace_destroy(struct ctf_trace *trace)
 	ASSERT_RCU_READ_LOCKED();
 
 	session_put(trace->session);
-	trace->session = NULL;
+	trace->session = nullptr;
 	free(trace->path);
-	trace->path = NULL;
+	trace->path = nullptr;
 	call_rcu(&trace->rcu_node, rcu_destroy_ctf_trace);
 }
 
 static void ctf_trace_release(struct urcu_ref *ref)
 {
-	struct ctf_trace *trace =
-		caa_container_of(ref, struct ctf_trace, ref);
+	struct ctf_trace *trace = lttng::utils::container_of(ref, &ctf_trace::ref);
 	int ret;
 	struct lttng_ht_iter iter;
 
@@ -92,12 +91,11 @@ bool ctf_trace_get(struct ctf_trace *trace)
  * create and refcounting. Whenever all the streams belonging to a trace
  * put their reference, its refcount drops to 0.
  */
-static struct ctf_trace *ctf_trace_create(struct relay_session *session,
-		const char *subpath)
+static struct ctf_trace *ctf_trace_create(struct relay_session *session, const char *subpath)
 {
 	struct ctf_trace *trace;
 
-	trace = (ctf_trace *) zmalloc(sizeof(*trace));
+	trace = zmalloc<ctf_trace>();
 	if (!trace) {
 		PERROR("Failed to allocate ctf_trace");
 		goto end;
@@ -122,19 +120,21 @@ static struct ctf_trace *ctf_trace_create(struct relay_session *session,
 
 	lttng_ht_node_init_str(&trace->node, trace->path);
 	trace->session = session;
-	pthread_mutex_init(&trace->lock, NULL);
-	pthread_mutex_init(&trace->stream_list_lock, NULL);
+	pthread_mutex_init(&trace->lock, nullptr);
+	pthread_mutex_init(&trace->stream_list_lock, nullptr);
 	lttng_ht_add_str(session->ctf_traces_ht, &trace->node);
 
-	DBG("Created ctf_trace %" PRIu64 "of session \"%s\" from host \"%s\" with path: %s",
-			trace->id, session->session_name, session->hostname,
-			subpath);
+	DBG("Created ctf_trace %" PRIu64 " of session \"%s\" from host \"%s\" with path: %s",
+	    trace->id,
+	    session->session_name,
+	    session->hostname,
+	    subpath);
 
 end:
 	return trace;
 error:
 	ctf_trace_put(trace);
-	return NULL;
+	return nullptr;
 }
 
 /*
@@ -143,11 +143,11 @@ error:
  * ctf_trace_put().
  */
 struct ctf_trace *ctf_trace_get_by_path_or_create(struct relay_session *session,
-		const char *subpath)
+						  const char *subpath)
 {
 	struct lttng_ht_node_str *node;
 	struct lttng_ht_iter iter;
-	struct ctf_trace *trace = NULL;
+	struct ctf_trace *trace = nullptr;
 
 	rcu_read_lock();
 	lttng_ht_lookup(session->ctf_traces_ht, subpath, &iter);
@@ -156,9 +156,9 @@ struct ctf_trace *ctf_trace_get_by_path_or_create(struct relay_session *session,
 		DBG("CTF Trace path %s not found", subpath);
 		goto end;
 	}
-	trace = caa_container_of(node, struct ctf_trace, node);
+	trace = lttng::utils::container_of(node, &ctf_trace::node);
 	if (!ctf_trace_get(trace)) {
-		trace = NULL;
+		trace = nullptr;
 	}
 end:
 	rcu_read_unlock();
@@ -181,8 +181,8 @@ int ctf_trace_close(struct ctf_trace *trace)
 	struct relay_stream *stream;
 
 	rcu_read_lock();
-	cds_list_for_each_entry_rcu(stream, &trace->stream_list,
-			stream_node) {
+	cds_list_for_each_entry_rcu(stream, &trace->stream_list, stream_node)
+	{
 		/*
 		 * Close stream since the connection owning the trace is being
 		 * torn down.
@@ -207,7 +207,7 @@ struct relay_viewer_stream *ctf_trace_get_viewer_metadata_stream(struct ctf_trac
 		goto end;
 	}
 	if (!viewer_stream_get(vstream)) {
-		vstream = NULL;
+		vstream = nullptr;
 	}
 end:
 	rcu_read_unlock();