X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Fdestruction-handle.cpp;h=688e4faba652dd023d47f9ff131fab9ee8b8e3f6;hb=1524f98c04431d04e50796f83a9dd29184b3a8a4;hp=0bfa303d804392107b612893cf50117a88c13bb6;hpb=1c9a0b0e83c7e073c4e576c0bed95de335b0e502;p=lttng-tools.git

diff --git a/src/lib/lttng-ctl/destruction-handle.cpp b/src/lib/lttng-ctl/destruction-handle.cpp
index 0bfa303d8..688e4faba 100644
--- a/src/lib/lttng-ctl/destruction-handle.cpp
+++ b/src/lib/lttng-ctl/destruction-handle.cpp
@@ -8,16 +8,16 @@
 #include <lttng/destruction-handle.h>
 #include <lttng/rotation.h>
 
-#include <common/optional.h>
-#include <common/compat/poll.h>
-#include <common/compat/time.h>
-#include <common/macros.h>
-#include <common/compat/poll.h>
-#include <common/dynamic-buffer.h>
-#include <common/buffer-view.h>
-#include <common/sessiond-comm/sessiond-comm.h>
-#include <lttng/location-internal.h>
-#include "lttng-ctl-helper.h"
+#include <common/optional.hpp>
+#include <common/compat/poll.hpp>
+#include <common/compat/time.hpp>
+#include <common/macros.hpp>
+#include <common/compat/poll.hpp>
+#include <common/dynamic-buffer.hpp>
+#include <common/buffer-view.hpp>
+#include <common/sessiond-comm/sessiond-comm.hpp>
+#include <lttng/location-internal.hpp>
+#include "lttng-ctl-helper.hpp"
 
 #include <algorithm>
 #include <stdbool.h>
@@ -69,7 +69,7 @@ struct lttng_destruction_handle *lttng_destruction_handle_create(
 		int sessiond_socket)
 {
 	int ret;
-	struct lttng_destruction_handle *handle = (lttng_destruction_handle *) zmalloc(sizeof(*handle));
+	struct lttng_destruction_handle *handle = zmalloc<lttng_destruction_handle>();
 
 	if (!handle) {
 		goto end;
@@ -82,7 +82,7 @@ struct lttng_destruction_handle *lttng_destruction_handle_create(
 	}
 
 	ret = lttng_poll_add(&handle->communication.events, sessiond_socket,
-			LPOLLIN | LPOLLHUP | LPOLLRDHUP | LPOLLERR);
+			LPOLLIN | LPOLLRDHUP);
 	if (ret) {
 		goto error;
 	}
@@ -390,7 +390,7 @@ enum lttng_error_code lttng_destroy_session_ext(const char *session_name,
 	ssize_t comm_ret;
 	enum lttng_error_code ret_code = LTTNG_OK;
 	struct lttcomm_session_msg lsm = {
-		.cmd_type = LTTNG_DESTROY_SESSION,
+		.cmd_type = LTTCOMM_SESSIOND_COMMAND_DESTROY_SESSION,
 		.session = {},
 		.domain = {},
 		.u = {},