projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement lttng_read()/lttng_write()
[lttng-tools.git]
/
src
/
common
/
consumer-timer.c
diff --git
a/src/common/consumer-timer.c
b/src/common/consumer-timer.c
index b02ccbb115a9cdd6337f5214bcd49b8d268aed79..b97cb28443a99232550de4d543b2607896452ead 100644
(file)
--- a/
src/common/consumer-timer.c
+++ b/
src/common/consumer-timer.c
@@
-21,6
+21,7
@@
#include <inttypes.h>
#include <signal.h>
#include <inttypes.h>
#include <signal.h>
+#include <bin/lttng-consumerd/health-consumerd.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>
@@
-28,7
+29,6
@@
#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,
@@
-397,7
+397,7
@@
void consumer_timer_live_start(struct lttng_consumer_channel *channel,
assert(channel);
assert(channel->key);
assert(channel);
assert(channel->key);
- if (live_timer_interval
=
= 0) {
+ if (live_timer_interval
<
= 0) {
return;
}
return;
}
@@
-472,12
+472,18
@@
void *consumer_timer_thread(void *data)
health_register(health_consumerd, HEALTH_CONSUMERD_TYPE_METADATA_TIMER);
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");
This page took
0.024811 seconds
and
4
git commands to generate.