X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Flttng-ctl.cpp;h=057a91e3e57f73f0b0afc5fd26e8c9f731efbb1e;hb=64803277bbdbe0a943360d918298a48157d9da55;hp=0da8f6ad100eef2217254382c9c7e1651aa339eb;hpb=f46376a14da2eb796690cb4e718e8b213839d6ea;p=lttng-tools.git

diff --git a/src/lib/lttng-ctl/lttng-ctl.cpp b/src/lib/lttng-ctl/lttng-ctl.cpp
index 0da8f6ad1..057a91e3e 100644
--- a/src/lib/lttng-ctl/lttng-ctl.cpp
+++ b/src/lib/lttng-ctl/lttng-ctl.cpp
@@ -18,38 +18,38 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <common/bytecode/bytecode.h>
-#include <common/align.h>
-#include <common/common.h>
-#include <common/compat/errno.h>
-#include <common/compat/string.h>
-#include <common/defaults.h>
-#include <common/dynamic-array.h>
-#include <common/dynamic-buffer.h>
-#include <common/payload-view.h>
-#include <common/payload.h>
-#include <common/sessiond-comm/sessiond-comm.h>
-#include <common/tracker.h>
-#include <common/unix.h>
-#include <common/uri.h>
-#include <common/utils.h>
-#include <lttng/channel-internal.h>
+#include <common/bytecode/bytecode.hpp>
+#include <common/align.hpp>
+#include <common/common.hpp>
+#include <common/compat/errno.hpp>
+#include <common/compat/string.hpp>
+#include <common/defaults.hpp>
+#include <common/dynamic-array.hpp>
+#include <common/dynamic-buffer.hpp>
+#include <common/payload-view.hpp>
+#include <common/payload.hpp>
+#include <common/sessiond-comm/sessiond-comm.hpp>
+#include <common/tracker.hpp>
+#include <common/unix.hpp>
+#include <common/uri.hpp>
+#include <common/utils.hpp>
+#include <lttng/channel-internal.hpp>
 #include <lttng/destruction-handle.h>
 #include <lttng/endpoint.h>
-#include <lttng/error-query-internal.h>
-#include <lttng/event-internal.h>
-#include <lttng/health-internal.h>
+#include <lttng/error-query-internal.hpp>
+#include <lttng/event-internal.hpp>
+#include <lttng/health-internal.hpp>
 #include <lttng/lttng-error.h>
 #include <lttng/lttng.h>
-#include <lttng/session-descriptor-internal.h>
-#include <lttng/session-internal.h>
-#include <lttng/trigger/trigger-internal.h>
-#include <lttng/userspace-probe-internal.h>
+#include <lttng/session-descriptor-internal.hpp>
+#include <lttng/session-internal.hpp>
+#include <lttng/trigger/trigger-internal.hpp>
+#include <lttng/userspace-probe-internal.hpp>
 
-#include "lttng-ctl-helper.h"
-#include <common/filter/filter-ast.h>
+#include "lttng-ctl-helper.hpp"
+#include <common/filter/filter-ast.hpp>
 #include <common/filter/filter-parser.hpp>
-#include <common/filter/memstream.h>
+#include <common/filter/memstream.hpp>
 
 #define COPY_DOMAIN_PACKED(dst, src)				\
 do {								\
@@ -266,7 +266,7 @@ int lttng_check_tracing_group(void)
 	}
 
 	/* Alloc group list of the right size */
-	grp_list = (gid_t *) zmalloc(grp_list_size * sizeof(gid_t));
+	grp_list = calloc<gid_t>(grp_list_size);
 	if (!grp_list) {
 		PERROR("malloc");
 		goto end;
@@ -500,7 +500,7 @@ static int recv_sessiond_optional_data(size_t len, void **user_buf,
 	size_t *user_len)
 {
 	int ret = 0;
-	void *buf = NULL;
+	char *buf = NULL;
 
 	if (len) {
 		if (!user_len) {
@@ -508,7 +508,7 @@ static int recv_sessiond_optional_data(size_t len, void **user_buf,
 			goto end;
 		}
 
-		buf = zmalloc(len);
+		buf = zmalloc<char>(len);
 		if (!buf) {
 			ret = -ENOMEM;
 			goto end;
@@ -729,7 +729,7 @@ struct lttng_handle *lttng_create_handle(const char *session_name,
 	int ret;
 	struct lttng_handle *handle = NULL;
 
-	handle = (lttng_handle *) zmalloc(sizeof(struct lttng_handle));
+	handle = zmalloc<lttng_handle>();
 	if (handle == NULL) {
 		PERROR("malloc handle");
 		goto end;
@@ -916,7 +916,13 @@ int lttng_add_context(struct lttng_handle *handle,
 		const char *channel_name)
 {
 	int ret;
-	struct lttcomm_session_msg lsm = { .cmd_type = LTTNG_ADD_CONTEXT };
+	struct lttcomm_session_msg lsm = {
+		.cmd_type = LTTNG_ADD_CONTEXT,
+		.session = {},
+		.domain = {},
+		.u = {},
+		.fd_count = 0,
+	};
 	struct lttng_payload payload;
 
 	lttng_payload_init(&payload);
@@ -1084,7 +1090,13 @@ int lttng_enable_event_with_exclusions(struct lttng_handle *handle,
 		const char *original_filter_expression,
 		int exclusion_count, char **exclusion_list)
 {
-	struct lttcomm_session_msg lsm = { .cmd_type = LTTNG_ENABLE_EVENT };
+	struct lttcomm_session_msg lsm = {
+		.cmd_type = LTTNG_ENABLE_EVENT,
+		.session = {},
+		.domain = {},
+		.u = {},
+		.fd_count = 0,
+	};
 	struct lttng_payload payload;
 	int ret = 0;
 	unsigned int free_filter_expression = 0;
@@ -1263,7 +1275,13 @@ int lttng_disable_event_ext(struct lttng_handle *handle,
 		struct lttng_event *ev, const char *channel_name,
 		const char *original_filter_expression)
 {
-	struct lttcomm_session_msg lsm = { .cmd_type = LTTNG_DISABLE_EVENT };
+	struct lttcomm_session_msg lsm = {
+		.cmd_type = LTTNG_DISABLE_EVENT,
+		.session = {},
+		.domain = {},
+		.u = {},
+		.fd_count = 0,
+	};
 	struct lttng_payload payload;
 	int ret = 0;
 	unsigned int free_filter_expression = 0;
@@ -1558,13 +1576,13 @@ int lttng_enable_channel(struct lttng_handle *handle,
 	/* Populate the channel extended attribute if necessary. */
 	if (!channel->attr.extended.ptr) {
 		struct lttng_channel_extended *extended =
-				(struct lttng_channel_extended *) zmalloc(
-						sizeof(*extended));
+				zmalloc<lttng_channel_extended>();
 
 		if (!extended) {
 			ret = -LTTNG_ERR_NOMEM;
 			goto end;
 		}
+
 		lttng_channel_set_default_extended_attr(
 				&handle->domain, extended);
 		channel->attr.extended.ptr = extended;
@@ -1650,7 +1668,13 @@ int lttng_list_tracepoints(struct lttng_handle *handle,
         enum lttng_error_code ret_code;
         int ret, total_payload_received;
         char *reception_buffer = NULL;
-        struct lttcomm_session_msg lsm = { .cmd_type = LTTNG_LIST_TRACEPOINTS };
+        struct lttcomm_session_msg lsm = {
+		.cmd_type = LTTNG_LIST_TRACEPOINTS,
+		.session = {},
+		.domain = {},
+		.u = {},
+		.fd_count = 0,
+	};
         struct lttcomm_list_command_header *cmd_header = NULL;
         size_t cmd_header_len;
         unsigned int nb_events = 0;
@@ -1875,6 +1899,10 @@ enum lttng_error_code lttng_create_session_ext(
 	enum lttng_error_code ret_code;
 	struct lttcomm_session_msg lsm = {
 		.cmd_type = LTTNG_CREATE_SESSION_EXT,
+		.session = {},
+		.domain = {},
+		.u = {},
+		.fd_count = 0,
 	};
 	void *reply = NULL;
 	struct lttng_buffer_view reply_view;
@@ -2983,6 +3011,10 @@ int _lttng_register_trigger(struct lttng_trigger *trigger, const char *name,
 	int ret;
 	struct lttcomm_session_msg lsm = {
 		.cmd_type = LTTNG_REGISTER_TRIGGER,
+		.session = {},
+		.domain = {},
+		.u = {},
+		.fd_count = 0,
 	};
 	lsm.u.trigger.is_trigger_anonymous = !name && !generate_name;
 	struct lttcomm_session_msg *message_lsm;
@@ -3155,6 +3187,10 @@ enum lttng_error_code lttng_error_query_execute(
 	enum lttng_error_code ret_code;
 	struct lttcomm_session_msg lsm = {
 		.cmd_type = LTTNG_EXECUTE_ERROR_QUERY,
+		.session = {},
+		.domain = {},
+		.u = {},
+		.fd_count = 0,
 	};
 	struct lttng_payload message;
 	struct lttng_payload reply;
@@ -3339,7 +3375,13 @@ enum lttng_error_code lttng_list_triggers(struct lttng_triggers **triggers)
 {
 	int ret;
 	enum lttng_error_code ret_code = LTTNG_OK;
-	struct lttcomm_session_msg lsm = { .cmd_type = LTTNG_LIST_TRIGGERS };
+	struct lttcomm_session_msg lsm = {
+		.cmd_type = LTTNG_LIST_TRIGGERS,
+		.session = {},
+		.domain = {},
+		.u = {},
+		.fd_count = 0,
+	};
 	struct lttng_triggers *local_triggers = NULL;
 	struct lttng_payload reply;
 	struct lttng_payload_view lsm_view =