projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Health check: implement health check query in sessiond and consumerd
[lttng-tools.git]
/
src
/
common
/
consumer-timer.c
diff --git
a/src/common/consumer-timer.c
b/src/common/consumer-timer.c
index 0f5d4ba9655d6985a656b069fcb83843d310f3a9..7ece0f6a54a37eb97084e8973cecc63c59b8b8e3 100644
(file)
--- a/
src/common/consumer-timer.c
+++ b/
src/common/consumer-timer.c
@@
-21,7
+21,6
@@
#include <inttypes.h>
#include <signal.h>
#include <inttypes.h>
#include <signal.h>
-#include <lttng/ust-ctl.h>
#include <common/common.h>
#include <common/kernel-ctl/kernel-ctl.h>
#include <common/kernel-consumer/kernel-consumer.h>
#include <common/common.h>
#include <common/kernel-ctl/kernel-ctl.h>
#include <common/kernel-consumer/kernel-consumer.h>
@@
-29,6
+28,7
@@
#include "consumer-timer.h"
#include "ust-consumer/ust-consumer.h"
#include "consumer-timer.h"
#include "ust-consumer/ust-consumer.h"
+#include "../bin/lttng-consumerd/health-consumerd.h"
static struct timer_signal_data timer_signal = {
.tid = 0,
static struct timer_signal_data timer_signal = {
.tid = 0,
@@
-191,13
+191,13
@@
static int check_ust_stream(struct lttng_consumer_stream *stream)
goto error_unlock;
}
goto error_unlock;
}
- ret =
ustctl_get_current_timestamp(stream->u
stream, &ts);
+ ret =
lttng_ustconsumer_get_current_timestamp(
stream, &ts);
if (ret < 0) {
ERR("Failed to get the current timestamp");
goto error_unlock;
}
if (ret < 0) {
ERR("Failed to get the current timestamp");
goto error_unlock;
}
-
ustctl_flush_buffer(stream->u
stream, 1);
- ret =
ustctl_snapshot(stream->u
stream);
+
lttng_ustconsumer_flush_buffer(
stream, 1);
+ ret =
lttng_ustconsumer_take_snapshot(
stream);
if (ret < 0) {
if (ret != -EAGAIN) {
ERR("Taking UST snapshot");
if (ret < 0) {
if (ret != -EAGAIN) {
ERR("Taking UST snapshot");
@@
-470,12
+470,20
@@
void *consumer_timer_thread(void *data)
siginfo_t info;
struct lttng_consumer_local_data *ctx = data;
siginfo_t info;
struct lttng_consumer_local_data *ctx = data;
+ health_register(health_consumerd, HEALTH_CONSUMERD_TYPE_METADATA_TIMER);
+
+ health_code_update();
+
/* Only self thread will receive signal mask. */
setmask(&mask);
CMM_STORE_SHARED(timer_signal.tid, pthread_self());
while (1) {
/* Only self thread will receive signal mask. */
setmask(&mask);
CMM_STORE_SHARED(timer_signal.tid, pthread_self());
while (1) {
+ health_code_update();
+
+ health_poll_entry();
signr = sigwaitinfo(&mask, &info);
signr = sigwaitinfo(&mask, &info);
+ health_poll_exit();
if (signr == -1) {
if (errno != EINTR) {
PERROR("sigwaitinfo");
if (signr == -1) {
if (errno != EINTR) {
PERROR("sigwaitinfo");
@@
-495,5
+503,9
@@
void *consumer_timer_thread(void *data)
}
}
}
}
+ /* Currently never reached */
+ health_unregister(health_consumerd);
+
+ /* Never return */
return NULL;
}
return NULL;
}
This page took
0.024129 seconds
and
4
git commands to generate.