X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Factions%2Fstop-session.cpp;h=08a6665dd0c196b63dbe3ee255f8037cf872027c;hb=0114db0ec2407029052eb61a0189c9b1cd64d520;hp=3cffb4a553b8a774684b0a438856273544609052;hpb=c9e313bc594f40a86eed237dce222c0fc99c957f;p=lttng-tools.git

diff --git a/src/common/actions/stop-session.cpp b/src/common/actions/stop-session.cpp
index 3cffb4a55..08a6665dd 100644
--- a/src/common/actions/stop-session.cpp
+++ b/src/common/actions/stop-session.cpp
@@ -17,6 +17,7 @@
 #define IS_STOP_SESSION_ACTION(action) \
 	(lttng_action_get_type(action) == LTTNG_ACTION_TYPE_STOP_SESSION)
 
+namespace {
 struct lttng_action_stop_session {
 	struct lttng_action parent;
 
@@ -37,6 +38,7 @@ struct lttng_action_stop_session_comm {
 	 */
 	char data[];
 } LTTNG_PACKED;
+} /* namespace */
 
 static const struct lttng_rate_policy *
 lttng_action_stop_session_internal_get_rate_policy(
@@ -47,7 +49,7 @@ static struct lttng_action_stop_session *action_stop_session_from_action(
 {
 	LTTNG_ASSERT(action);
 
-	return container_of(action, struct lttng_action_stop_session, parent);
+	return lttng::utils::container_of(action, &lttng_action_stop_session::parent);
 }
 
 static const struct lttng_action_stop_session *
@@ -55,7 +57,7 @@ action_stop_session_from_action_const(const struct lttng_action *action)
 {
 	LTTNG_ASSERT(action);
 
-	return container_of(action, struct lttng_action_stop_session, parent);
+	return lttng::utils::container_of(action, &lttng_action_stop_session::parent);
 }
 
 static bool lttng_action_stop_session_validate(struct lttng_action *action)
@@ -291,7 +293,7 @@ end:
 
 struct lttng_action *lttng_action_stop_session_create(void)
 {
-	struct lttng_action *action = NULL;
+	struct lttng_action_stop_session *action_stop = NULL;
 	struct lttng_rate_policy *policy = NULL;
 	enum lttng_action_status status;
 
@@ -301,12 +303,12 @@ struct lttng_action *lttng_action_stop_session_create(void)
 		goto end;
 	}
 
-	action = (lttng_action *) zmalloc(sizeof(struct lttng_action_stop_session));
-	if (!action) {
+	action_stop = zmalloc<lttng_action_stop_session>();
+	if (!action_stop) {
 		goto end;
 	}
 
-	lttng_action_init(action, LTTNG_ACTION_TYPE_STOP_SESSION,
+	lttng_action_init(&action_stop->parent, LTTNG_ACTION_TYPE_STOP_SESSION,
 			lttng_action_stop_session_validate,
 			lttng_action_stop_session_serialize,
 			lttng_action_stop_session_is_equal,
@@ -315,16 +317,17 @@ struct lttng_action *lttng_action_stop_session_create(void)
 			lttng_action_generic_add_error_query_results,
 			lttng_action_stop_session_mi_serialize);
 
-	status = lttng_action_stop_session_set_rate_policy(action, policy);
+	status = lttng_action_stop_session_set_rate_policy(
+			&action_stop->parent, policy);
 	if (status != LTTNG_ACTION_STATUS_OK) {
-		free(action);
-		action = NULL;
+		lttng_action_destroy(&action_stop->parent);
+		action_stop = NULL;
 		goto end;
 	}
 
 end:
 	lttng_rate_policy_destroy(policy);
-	return action;
+	return &action_stop->parent;
 }
 
 enum lttng_action_status lttng_action_stop_session_set_session_name(