X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fuserspace-probe.cpp;h=99893b6432cfa687098f28f115e1798a66c61e27;hb=05aa7e19ec97871aad18d7c9787c4c89611cd2cd;hp=4ade5d84fcb93df2ec7971574770b0dfe811c02c;hpb=a6bc4ca9d659caf016ef932fcd944029737ac57c;p=lttng-tools.git

diff --git a/src/common/userspace-probe.cpp b/src/common/userspace-probe.cpp
index 4ade5d84f..99893b643 100644
--- a/src/common/userspace-probe.cpp
+++ b/src/common/userspace-probe.cpp
@@ -6,18 +6,18 @@
  */
 
 #include "lttng/lttng-error.h"
-#include <common/compat/string.h>
-#include <common/align.h>
-#include <common/error.h>
-#include <common/hashtable/hashtable.h>
-#include <common/hashtable/utils.h>
-#include <common/macros.h>
-#include <common/mi-lttng.h>
-#include <common/payload-view.h>
-#include <common/payload.h>
+#include <common/compat/string.hpp>
+#include <common/align.hpp>
+#include <common/error.hpp>
+#include <common/hashtable/hashtable.hpp>
+#include <common/hashtable/utils.hpp>
+#include <common/macros.hpp>
+#include <common/mi-lttng.hpp>
+#include <common/payload-view.hpp>
+#include <common/payload.hpp>
 #include <fcntl.h>
 #include <lttng/constant.h>
-#include <lttng/userspace-probe-internal.h>
+#include <lttng/userspace-probe-internal.hpp>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -72,7 +72,7 @@ lttng_userspace_probe_location_lookup_method_function_elf_create(void)
 	struct lttng_userspace_probe_location_lookup_method *ret = NULL;
 	struct lttng_userspace_probe_location_lookup_method_elf *elf_method;
 
-	elf_method = (lttng_userspace_probe_location_lookup_method_elf *) zmalloc(sizeof(*elf_method));
+	elf_method = zmalloc<lttng_userspace_probe_location_lookup_method_elf>();
 	if (!elf_method) {
 		PERROR("zmalloc");
 		goto end;
@@ -90,7 +90,7 @@ lttng_userspace_probe_location_lookup_method_tracepoint_sdt_create(void)
 	struct lttng_userspace_probe_location_lookup_method *ret = NULL;
 	struct lttng_userspace_probe_location_lookup_method_sdt *sdt_method;
 
-	sdt_method = (lttng_userspace_probe_location_lookup_method_sdt *) zmalloc(sizeof(*sdt_method));
+	sdt_method = zmalloc<lttng_userspace_probe_location_lookup_method_sdt>();
 	if (!sdt_method) {
 		PERROR("zmalloc");
 		goto end;
@@ -311,7 +311,7 @@ lttng_userspace_probe_location_function_create_no_check(const char *binary_path,
 		goto error;
 	}
 
-	location = (lttng_userspace_probe_location_function *) zmalloc(sizeof(*location));
+	location = zmalloc<lttng_userspace_probe_location_function>();
 	if (!location) {
 		PERROR("Error allocating userspace probe location");
 		goto error;
@@ -448,7 +448,7 @@ lttng_userspace_probe_location_tracepoint_create_no_check(const char *binary_pat
 		goto error;
 	}
 
-	location = (lttng_userspace_probe_location_tracepoint *) zmalloc(sizeof(*location));
+	location = zmalloc<lttng_userspace_probe_location_tracepoint>();
 	if (!location) {
 		PERROR("zmalloc");
 		goto error;
@@ -547,7 +547,7 @@ lttng_userspace_probe_location_lookup_method_function_elf_copy(
 	LTTNG_ASSERT(lookup_method->type ==
 			LTTNG_USERSPACE_PROBE_LOCATION_LOOKUP_METHOD_TYPE_FUNCTION_ELF);
 
-	elf_method = (lttng_userspace_probe_location_lookup_method_elf *) zmalloc(sizeof(*elf_method));
+	elf_method = zmalloc<lttng_userspace_probe_location_lookup_method_elf>();
 	if (!elf_method) {
 		PERROR("Error allocating ELF userspace probe lookup method");
 		goto error;
@@ -574,7 +574,7 @@ lttng_userspace_probe_location_lookup_method_tracepoint_sdt_copy(
 	LTTNG_ASSERT(lookup_method->type ==
 			LTTNG_USERSPACE_PROBE_LOCATION_LOOKUP_METHOD_TYPE_TRACEPOINT_SDT);
 
-	sdt_method = (lttng_userspace_probe_location_lookup_method_sdt *) zmalloc(sizeof(*sdt_method));
+	sdt_method = zmalloc<lttng_userspace_probe_location_lookup_method_sdt>();
 	if (!sdt_method) {
 		PERROR("zmalloc");
 		goto error;