X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Flttng-ctl-health.cpp;h=e3234d5d4e3ef75a70761ea20420cf500f356b8a;hb=64803277bbdbe0a943360d918298a48157d9da55;hp=8a703b019e14b04a8536aa26dc9d35c28c98fb66;hpb=411b31544f22b773b4aad6cdb81faa81dc05e641;p=lttng-tools.git

diff --git a/src/lib/lttng-ctl/lttng-ctl-health.cpp b/src/lib/lttng-ctl/lttng-ctl-health.cpp
index 8a703b019..e3234d5d4 100644
--- a/src/lib/lttng-ctl/lttng-ctl-health.cpp
+++ b/src/lib/lttng-ctl/lttng-ctl-health.cpp
@@ -3,7 +3,7 @@
  *
  * Linux Trace Toolkit Health Control Library
  *
- * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 EfficiOS Inc.
  * Copyright (C) 2013 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * SPDX-License-Identifier: LGPL-2.1-only
@@ -16,16 +16,16 @@
 #include <stdint.h>
 #include <limits.h>
 #include <string.h>
-#include <lttng/health-internal.h>
+#include <lttng/health-internal.hpp>
 
-#include <bin/lttng-sessiond/health-sessiond.h>
-#include <bin/lttng-consumerd/health-consumerd.h>
-#include <bin/lttng-relayd/health-relayd.h>
-#include <common/defaults.h>
-#include <common/utils.h>
-#include <common/compat/errno.h>
+#include <bin/lttng-sessiond/health-sessiond.hpp>
+#include <bin/lttng-consumerd/health-consumerd.hpp>
+#include <bin/lttng-relayd/health-relayd.hpp>
+#include <common/defaults.hpp>
+#include <common/utils.hpp>
+#include <common/compat/errno.hpp>
 
-#include "lttng-ctl-helper.h"
+#include "lttng-ctl-helper.hpp"
 
 enum health_component {
 	HEALTH_COMPONENT_SESSIOND,
@@ -64,8 +64,6 @@ const char *get_sessiond_thread_name(health_type_sessiond type) {
 		return "Session daemon kernel";
 	case HEALTH_SESSIOND_TYPE_CONSUMER:
 		return "Session daemon consumer manager";
-	case HEALTH_SESSIOND_TYPE_HT_CLEANUP:
-		return "Session daemon hash table cleanup";
 	case HEALTH_SESSIOND_TYPE_APP_MANAGE_NOTIFY:
 		return "Session daemon application notification manager";
 	case HEALTH_SESSIOND_TYPE_APP_REG_DISPATCH:
@@ -233,7 +231,7 @@ struct lttng_health *lttng_health_create(enum health_component hc,
 	struct lttng_health *lh;
 	int i;
 
-	lh = (lttng_health *) zmalloc(sizeof(*lh) + sizeof(lh->thread[0]) * nr_threads);
+	lh = zmalloc<lttng_health>(sizeof(*lh) + sizeof(lh->thread[0]) * nr_threads);
 	if (!lh) {
 		return NULL;
 	}