X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=include%2Flttng%2Fhealth-internal.h;h=875cc960b329a015de2af81962a4c4a6fba2563a;hp=f4270647f8f999a79a22bc0fef945e913facde0e;hb=7966af5763c4aaca39df9bbfa9277ff15715c720;hpb=0c89d7959f4af7a2b39e925b2e8dc3a8954ccfa5

diff --git a/include/lttng/health-internal.h b/include/lttng/health-internal.h
index f4270647f..875cc960b 100644
--- a/include/lttng/health-internal.h
+++ b/include/lttng/health-internal.h
@@ -2,29 +2,24 @@
 #define HEALTH_INTERNAL_H
 
 /*
- * Copyright (C) 2012 - David Goulet <dgoulet@efficios.com>
- * Copyright (C) 2013 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2012 David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2013 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License, version 2 only, as
- * published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <assert.h>
-#include <time.h>
+#include <common/compat/time.h>
 #include <pthread.h>
 #include <urcu/tls-compat.h>
 #include <urcu/uatomic.h>
 #include <urcu/list.h>
+#include <lttng/health.h>
+#include <common/macros.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /*
  * These are the value added to the current state depending of the position in
@@ -64,12 +59,11 @@ enum health_cmd {
 };
 
 struct health_comm_msg {
-	uint32_t component;
 	uint32_t cmd;		/* enum health_cmd */
 } LTTNG_PACKED;
 
 struct health_comm_reply {
-	uint32_t ret_code;
+	uint64_t ret_code;	/* bitmask of threads in bad health */
 } LTTNG_PACKED;
 
 /* Declare TLS health state. */
@@ -78,12 +72,12 @@ extern DECLARE_URCU_TLS(struct health_state, health_state);
 /*
  * Update current counter by 1 to indicate that the thread entered or left a
  * blocking state caused by a poll(). If the counter's value is not an even
- * number (meaning a code execution flow), an assert() is raised.
+ * number (meaning a code execution flow), an LTTNG_ASSERT() is raised.
  */
 static inline void health_poll_entry(void)
 {
 	/* Code MUST be in code execution state which is an even number. */
-	assert(!(uatomic_read(&URCU_TLS(health_state).current)
+	LTTNG_ASSERT(!(uatomic_read(&URCU_TLS(health_state).current)
 				& HEALTH_POLL_VALUE));
 
 	uatomic_add(&URCU_TLS(health_state).current, HEALTH_POLL_VALUE);
@@ -91,13 +85,13 @@ static inline void health_poll_entry(void)
 
 /*
  * Update current counter by 1 indicating the exit of a poll or blocking call.
- * If the counter's value is not an odd number (a poll execution), an assert()
+ * If the counter's value is not an odd number (a poll execution), an LTTNG_ASSERT()
  * is raised.
  */
 static inline void health_poll_exit(void)
 {
 	/* Code MUST be in poll execution state which is an odd number. */
-	assert(uatomic_read(&URCU_TLS(health_state).current)
+	LTTNG_ASSERT(uatomic_read(&URCU_TLS(health_state).current)
 				& HEALTH_POLL_VALUE);
 
 	uatomic_add(&URCU_TLS(health_state).current, HEALTH_POLL_VALUE);
@@ -126,4 +120,8 @@ int health_check_state(struct health_app *ha, int type);
 void health_register(struct health_app *ha, int type);
 void health_unregister(struct health_app *ha);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* HEALTH_INTERNAL_H */