common: replace container_of with a C++ safe implementation

[lttng-tools.git] / src / bin / lttng-relayd / connection.cpp

diff --git a/src/bin/lttng-relayd/connection.cpp b/src/bin/lttng-relayd/connection.cpp
index fb53862a436bde4a4c84b1cc7e6a467049efa444..711de3a5cff81a76a2ae3bd9fb8e1ca4cc6311bf 100644 (file)
--- a/src/bin/lttng-relayd/connection.cpp
+++ b/src/bin/lttng-relayd/connection.cpp
@@ -37,7 +37,7 @@ struct relay_connection *connection_get_by_sock(struct lttng_ht *relay_connectio
                DBG2("Relay connection by sock %d not found", sock);
                goto end;
        }
                DBG2("Relay connection by sock %d not found", sock);
                goto end;
        }

-       conn = caa_container_of(node, struct relay_connection, sock_n);
+       conn = lttng::utils::container_of(node, &relay_connection::sock_n);

        if (!connection_get(conn)) {
                conn = NULL;
        }
        if (!connection_get(conn)) {
                conn = NULL;
        }


@@ -110,7 +110,7 @@ end:
 static void rcu_free_connection(struct rcu_head *head)
 {
        struct relay_connection *conn =
 static void rcu_free_connection(struct rcu_head *head)
 {
        struct relay_connection *conn =

-               caa_container_of(head, struct relay_connection, rcu_node);
+               lttng::utils::container_of(head, &relay_connection::rcu_node);

 
        lttcomm_destroy_sock(conn->sock);
        if (conn->viewer_session) {
 
        lttcomm_destroy_sock(conn->sock);
        if (conn->viewer_session) {


@@ -132,7 +132,7 @@ static void destroy_connection(struct relay_connection *conn)
 static void connection_release(struct urcu_ref *ref)
 {
        struct relay_connection *conn =
 static void connection_release(struct urcu_ref *ref)
 {
        struct relay_connection *conn =

-               caa_container_of(ref, struct relay_connection, ref);
+               lttng::utils::container_of(ref, &relay_connection::ref);

 
        if (conn->in_socket_ht) {
                struct lttng_ht_iter iter;
 
        if (conn->in_socket_ht) {
                struct lttng_ht_iter iter;