X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Ftracker.cpp;h=47d8ecb5cf1e1e123173222c49b8f893efaf08a1;hb=0267b5278de7bf4ee1ec11f2270dec4b44e80f36;hp=b7fc1f78a0f794976022bb29ab1c37b1fef3689e;hpb=1c9a0b0e83c7e073c4e576c0bed95de335b0e502;p=lttng-tools.git

diff --git a/src/lib/lttng-ctl/tracker.cpp b/src/lib/lttng-ctl/tracker.cpp
index b7fc1f78a..47d8ecb5c 100644
--- a/src/lib/lttng-ctl/tracker.cpp
+++ b/src/lib/lttng-ctl/tracker.cpp
@@ -5,14 +5,14 @@
  *
  */
 
-#include <type_traits>
+#include <lttng/domain.h>
+#include <lttng/lttng-error.h>
 
-#include "lttng-ctl-helper.h"
-#include "lttng/domain.h"
-#include "lttng/lttng-error.h"
-#include <common/sessiond-comm/sessiond-comm.h>
-#include <common/tracker.h>
+#include "lttng-ctl-helper.hpp"
+#include <common/sessiond-comm/sessiond-comm.hpp>
+#include <common/tracker.hpp>
 #include <lttng/tracker.h>
+#include <type_traits>
 
 struct lttng_process_attr_tracker_handle {
 	char *session_name;
@@ -53,7 +53,7 @@ enum lttng_error_code lttng_session_get_tracker_handle(const char *session_name,
 		goto error;
 	}
 
-	handle = (lttng_process_attr_tracker_handle *) zmalloc(sizeof(*handle));
+	handle = zmalloc<lttng_process_attr_tracker_handle>();
 	if (!handle) {
 		ret_code = LTTNG_ERR_NOMEM;
 		goto error;
@@ -102,7 +102,7 @@ lttng_process_attr_tracker_handle_get_tracking_policy(
 	enum lttng_process_attr_tracker_handle_status status =
 			LTTNG_PROCESS_ATTR_TRACKER_HANDLE_STATUS_OK;
 	struct lttcomm_session_msg lsm = {
-		.cmd_type = LTTNG_PROCESS_ATTR_TRACKER_GET_POLICY,
+		.cmd_type = LTTCOMM_SESSIOND_COMMAND_PROCESS_ATTR_TRACKER_GET_POLICY,
 		.session = {},
 		.domain = {},
 		.u = {},
@@ -153,7 +153,7 @@ lttng_process_attr_tracker_handle_set_tracking_policy(
 	enum lttng_process_attr_tracker_handle_status status =
 			LTTNG_PROCESS_ATTR_TRACKER_HANDLE_STATUS_OK;
 	struct lttcomm_session_msg lsm = {
-		.cmd_type = LTTNG_PROCESS_ATTR_TRACKER_SET_POLICY,
+		.cmd_type = LTTCOMM_SESSIOND_COMMAND_PROCESS_ATTR_TRACKER_SET_POLICY,
 		.session = {},
 		.domain = {},
 		.u = {},
@@ -205,7 +205,7 @@ end:
 		enum lttng_process_attr_tracker_handle_status status =                                               \
 				LTTNG_PROCESS_ATTR_TRACKER_HANDLE_STATUS_OK;                                         \
 		struct lttcomm_session_msg lsm = {                                                                   \
-			.cmd_type = LTTNG_PROCESS_ATTR_TRACKER_##command_upper##_INCLUDE_VALUE,                      \
+			.cmd_type = LTTCOMM_SESSIOND_COMMAND_PROCESS_ATTR_TRACKER_##command_upper##_INCLUDE_VALUE,                      \
 			.session = {},                                                                               \
 			.domain = {},                                                                                \
 			.u = {},                                                                                     \
@@ -273,7 +273,7 @@ end:
 		enum lttng_process_attr_tracker_handle_status status =                                               \
 				LTTNG_PROCESS_ATTR_TRACKER_HANDLE_STATUS_OK;                                         \
 		struct lttcomm_session_msg lsm = {                                                                   \
-			.cmd_type = LTTNG_PROCESS_ATTR_TRACKER_##command_upper##_INCLUDE_VALUE,                      \
+			.cmd_type = LTTCOMM_SESSIOND_COMMAND_PROCESS_ATTR_TRACKER_##command_upper##_INCLUDE_VALUE,                      \
 			.session = {},                                                                               \
 			.domain = {},                                                                                \
 			.u = {},                                                                                     \
@@ -392,7 +392,7 @@ lttng_process_attr_tracker_handle_get_inclusion_set(
 	enum lttng_process_attr_tracker_handle_status status =
 			LTTNG_PROCESS_ATTR_TRACKER_HANDLE_STATUS_OK;
 	struct lttcomm_session_msg lsm = {
-		.cmd_type = LTTNG_PROCESS_ATTR_TRACKER_GET_INCLUSION_SET,
+		.cmd_type = LTTCOMM_SESSIOND_COMMAND_PROCESS_ATTR_TRACKER_GET_INCLUSION_SET,
 		.session = {},
 		.domain = {},
 		.u = {},
@@ -779,7 +779,7 @@ int lttng_list_tracker_pids(struct lttng_handle *handle,
 		goto end;
 	}
 
-	pid_array = (int32_t *) zmalloc(pid_count * sizeof(int32_t));
+	pid_array = calloc<int32_t>(pid_count);
 	if (!pid_array) {
 		ret_code = LTTNG_ERR_NOMEM;
 		goto end;