X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fhealth.h;h=91a90706a77928acbcaa2fdd83bf8b958f69e7c1;hp=b268860156aa4e1c2e24db3fd2acb9600e5ed640;hb=927ca06aed61ff6dd3f64ae71854f2d7f9acebe5;hpb=139ac87245fd1ca18d60a0efca32b50e4c1d8730

diff --git a/src/bin/lttng-sessiond/health.h b/src/bin/lttng-sessiond/health.h
index b26886015..91a90706a 100644
--- a/src/bin/lttng-sessiond/health.h
+++ b/src/bin/lttng-sessiond/health.h
@@ -18,8 +18,12 @@
 #ifndef _HEALTH_H
 #define _HEALTH_H
 
-#include <stdint.h>
+#include <assert.h>
+#include <time.h>
+#include <pthread.h>
+#include <urcu/tls-compat.h>
 #include <urcu/uatomic.h>
+#include <urcu/list.h>
 
 /*
  * These are the value added to the current state depending of the position in
@@ -31,23 +35,44 @@
 #define HEALTH_IS_IN_POLL(x)	((x) & HEALTH_POLL_VALUE)
 
 enum health_flags {
-	HEALTH_EXIT = (1U << 0),
-	HEALTH_ERROR = (1U << 1),
+	HEALTH_ERROR = (1U << 0),
+};
+
+enum health_type {
+	HEALTH_TYPE_CMD			= 0,
+	HEALTH_TYPE_APP_MANAGE	= 1,
+	HEALTH_TYPE_APP_REG		= 2,
+	HEALTH_TYPE_KERNEL		= 3,
+	HEALTH_TYPE_CONSUMER	= 4,
+
+	HEALTH_NUM_TYPE,
+};
+
+struct health_tls_state_list {
+	struct cds_list_head head;
 };
 
 struct health_state {
 	/*
-	 * last counter is only read and updated by the health_check
+	 * last counter and last_time are only read and updated by the health_check
 	 * thread (single updater).
 	 */
 	unsigned long last;
+	struct timespec last_time;
+
 	/*
 	 * current and flags are updated by multiple threads concurrently.
 	 */
 	unsigned long current;		/* progress counter, updated atomically */
 	enum health_flags flags;	/* other flags, updated atomically */
+	enum health_type type;		/* Indicates the nature of the thread. */
+	/* Node of the global TLS state list. */
+	struct cds_list_head node;
 };
 
+/* Declare TLS health state. */
+extern DECLARE_URCU_TLS(struct health_state, health_state);
+
 /* Health state counters for the client command thread */
 extern struct health_state health_thread_cmd;
 
@@ -66,8 +91,7 @@ extern struct health_state health_thread_kernel;
  */
 static inline void health_poll_update(struct health_state *state)
 {
-	assert(state);
-	uatomic_add(&state->current, HEALTH_POLL_VALUE);
+	uatomic_add(&URCU_TLS(health_state).current, HEALTH_POLL_VALUE);
 }
 
 /*
@@ -76,17 +100,7 @@ static inline void health_poll_update(struct health_state *state)
  */
 static inline void health_code_update(struct health_state *state)
 {
-	assert(state);
-	uatomic_add(&state->current, HEALTH_CODE_VALUE);
-}
-
-/*
- * Set health "exit" flag.
- */
-static inline void health_exit(struct health_state *state)
-{
-	assert(state);
-	uatomic_or(&state->flags, HEALTH_EXIT);
+	uatomic_add(&URCU_TLS(health_state).current, HEALTH_CODE_VALUE);
 }
 
 /*
@@ -94,21 +108,11 @@ static inline void health_exit(struct health_state *state)
  */
 static inline void health_error(struct health_state *state)
 {
-	assert(state);
-	uatomic_or(&state->flags, HEALTH_ERROR);
-}
-
-/*
- * Init health state.
- */
-static inline void health_init(struct health_state *state)
-{
-	assert(state);
-	uatomic_set(&state->last, 0);
-	uatomic_set(&state->current, 0);
-	uatomic_set(&state->flags, 0);
+	uatomic_or(&URCU_TLS(health_state).flags, HEALTH_ERROR);
 }
 
-int health_check_state(struct health_state *state);
+int health_check_state(enum health_type type);
+void health_register(enum health_type type);
+void health_unregister(void);
 
 #endif /* _HEALTH_H */