Clean-up: lttng: fix -Wshadow error in lttng_session_descriptor

[lttng-tools.git] / include / lttng / health-internal.h

diff --git a/include/lttng/health-internal.h b/include/lttng/health-internal.h
index 3ad25d8261858c767ec0891fb61d165714e9b245..80aa23fd549374e7cfb008b73c91e05c027d10e7 100644 (file)
--- a/include/lttng/health-internal.h
+++ b/include/lttng/health-internal.h
@@ -2,30 +2,21 @@
 #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>
 
 /*
  * These are the value added to the current state depending of the position in
@@ -65,21 +56,13 @@ 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;
 
-/*
- * Status returned to lttng clients.
- */
-struct lttng_health_status {
-       uint64_t error_threads_bitmask;
-};
-
 /* Declare TLS health state. */
 extern DECLARE_URCU_TLS(struct health_state, health_state);