common: replace container_of with a C++ safe implementation

[lttng-tools.git] / src / common / actions / start-session.cpp

diff --git a/src/common/actions/start-session.cpp b/src/common/actions/start-session.cpp
index 1312e5ec5f278e3026893089e080fe87f8dbc6ca..2c9f799727e43ad454ab32610c16fe14000b68a6 100644 (file)
--- a/src/common/actions/start-session.cpp
+++ b/src/common/actions/start-session.cpp
@@ -5,18 +5,19 @@
  *
  */
 
-#include <common/error.h>
-#include <common/macros.h>
-#include <common/mi-lttng.h>
-#include <lttng/action/action-internal.h>
-#include <lttng/action/rate-policy-internal.h>
+#include <common/error.hpp>
+#include <common/macros.hpp>
+#include <common/mi-lttng.hpp>
+#include <lttng/action/action-internal.hpp>
+#include <lttng/action/rate-policy-internal.hpp>
 #include <lttng/action/rate-policy.h>
-#include <lttng/action/start-session-internal.h>
+#include <lttng/action/start-session-internal.hpp>
 #include <lttng/action/start-session.h>
 
 #define IS_START_SESSION_ACTION(action) \
        (lttng_action_get_type(action) == LTTNG_ACTION_TYPE_START_SESSION)
 
+namespace {
 struct lttng_action_start_session {
        struct lttng_action parent;
 
@@ -37,6 +38,7 @@ struct lttng_action_start_session_comm {
         */
        char data[];
 } LTTNG_PACKED;
+} /* namespace */
 
 static const struct lttng_rate_policy *
 lttng_action_start_session_internal_get_rate_policy(
@@ -47,7 +49,7 @@ static struct lttng_action_start_session *action_start_session_from_action(
 {
        LTTNG_ASSERT(action);
 
-       return container_of(action, struct lttng_action_start_session, parent);
+       return lttng::utils::container_of(action, &lttng_action_start_session::parent);
 }
 
 static const struct lttng_action_start_session *
@@ -55,7 +57,7 @@ action_start_session_from_action_const(const struct lttng_action *action)
 {
        LTTNG_ASSERT(action);
 
-       return container_of(action, struct lttng_action_start_session, parent);
+       return lttng::utils::container_of(action, &lttng_action_start_session::parent);
 }
 
 static bool lttng_action_start_session_validate(struct lttng_action *action)
@@ -88,8 +90,8 @@ static bool lttng_action_start_session_is_equal(
        bool is_equal = false;
        struct lttng_action_start_session *a, *b;
 
-       a = container_of(_a, struct lttng_action_start_session, parent);
-       b = container_of(_b, struct lttng_action_start_session, parent);
+       a = lttng::utils::container_of(_a, &lttng_action_start_session::parent);
+       b = lttng::utils::container_of(_b, &lttng_action_start_session::parent);
 
        /* Action is not valid if this is not true. */
        LTTNG_ASSERT(a->session_name);
@@ -291,7 +293,7 @@ end:
 
 struct lttng_action *lttng_action_start_session_create(void)
 {
-       struct lttng_action *action = NULL;
+       struct lttng_action_start_session *action_start = NULL;
        struct lttng_rate_policy *policy = NULL;
        enum lttng_action_status status;
 
@@ -301,12 +303,13 @@ struct lttng_action *lttng_action_start_session_create(void)
                goto end;
        }
 
-       action = (lttng_action *) zmalloc(sizeof(struct lttng_action_start_session));
-       if (!action) {
+       action_start = zmalloc<lttng_action_start_session>();
+       if (!action_start) {
                goto end;
        }
 
-       lttng_action_init(action, LTTNG_ACTION_TYPE_START_SESSION,
+       lttng_action_init(&action_start->parent,
+                       LTTNG_ACTION_TYPE_START_SESSION,
                        lttng_action_start_session_validate,
                        lttng_action_start_session_serialize,
                        lttng_action_start_session_is_equal,
@@ -315,16 +318,17 @@ struct lttng_action *lttng_action_start_session_create(void)
                        lttng_action_generic_add_error_query_results,
                        lttng_action_start_session_mi_serialize);
 
-       status = lttng_action_start_session_set_rate_policy(action, policy);
+       status = lttng_action_start_session_set_rate_policy(
+                       &action_start->parent, policy);
        if (status != LTTNG_ACTION_STATUS_OK) {
-               free(action);
-               action = NULL;
+               lttng_action_destroy(&action_start->parent);
+               action_start = NULL;
                goto end;
        }
 
 end:
        lttng_rate_policy_destroy(policy);
-       return action;
+       return &action_start->parent;
 }
 
 enum lttng_action_status lttng_action_start_session_set_session_name(