sessiond-comm: prefix lttcomm_sessiond_command entries

[lttng-tools.git] / src / lib / lttng-ctl / tracker.cpp

diff --git a/src/lib/lttng-ctl/tracker.cpp b/src/lib/lttng-ctl/tracker.cpp
index 40af23cd1214008ed0d11f3798fac905a0cbb2b9..47d8ecb5cf1e1e123173222c49b8f893efaf08a1 100644 (file)
--- 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,11 @@ 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 = {},
+               .fd_count = 0,
        };
 
        if (!tracker || !policy) {
@@ -149,7 +153,11 @@ 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 = {},
+               .fd_count = 0,
        };
 
        if (!tracker) {
@@ -197,7 +205,12 @@ 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 = {},                                                                                     \
+                       .fd_count = 0,                                                                               \
+               };                                                                                                   \
                                                                                                                      \
                if (!tracker) {                                                                                      \
                        status = LTTNG_PROCESS_ATTR_TRACKER_HANDLE_STATUS_INVALID;                                   \
@@ -260,7 +273,12 @@ 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 = {},                                                                                     \
+                       .fd_count = 0,                                                                               \
+               };                                                                                                   \
                const size_t len = value ? strlen(value) + 1 : 0;                                                    \
                                                                                                                      \
                if (!tracker || !value) {                                                                            \
@@ -374,7 +392,11 @@ 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 = {},
+               .fd_count = 0,
        };
        struct lttng_buffer_view inclusion_set_view;
        ssize_t inclusion_set_ret;
@@ -757,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;