projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: handle new streams in live mode in relayd
[lttng-tools.git]
/
src
/
common
/
consumer-timer.c
diff --git
a/src/common/consumer-timer.c
b/src/common/consumer-timer.c
index 1571d86de78b95437d7f7ab833af79129a6b39e2..b867a35bf0d6e9d44da62698fa366f7e06bd2d70 100644
(file)
--- a/
src/common/consumer-timer.c
+++ b/
src/common/consumer-timer.c
@@
-28,6
+28,7
@@
#include <common/consumer-stream.h>
#include "consumer-timer.h"
#include <common/consumer-stream.h>
#include "consumer-timer.h"
+#include "consumer-testpoint.h"
#include "ust-consumer/ust-consumer.h"
static struct timer_signal_data timer_signal = {
#include "ust-consumer/ust-consumer.h"
static struct timer_signal_data timer_signal = {
@@
-115,7
+116,7
@@
static void metadata_switch_timer(struct lttng_consumer_local_data *ctx,
static int send_empty_index(struct lttng_consumer_stream *stream, uint64_t ts)
{
int ret;
static int send_empty_index(struct lttng_consumer_stream *stream, uint64_t ts)
{
int ret;
- struct
lttng
_packet_index index;
+ struct
ctf
_packet_index index;
memset(&index, 0, sizeof(index));
index.timestamp_end = htobe64(ts);
memset(&index, 0, sizeof(index));
index.timestamp_end = htobe64(ts);
@@
-397,7
+398,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,6
+473,10
@@
void *consumer_timer_thread(void *data)
health_register(health_consumerd, HEALTH_CONSUMERD_TYPE_METADATA_TIMER);
health_register(health_consumerd, HEALTH_CONSUMERD_TYPE_METADATA_TIMER);
+ if (testpoint(consumerd_thread_metadata_timer)) {
+ goto error_testpoint;
+ }
+
health_code_update();
/* Only self thread will receive signal mask. */
health_code_update();
/* Only self thread will receive signal mask. */
@@
-503,7
+508,9
@@
void *consumer_timer_thread(void *data)
}
}
}
}
- /* Currently never reached */
+error_testpoint:
+ /* Only reached in testpoint error */
+ health_error();
health_unregister(health_consumerd);
/* Never return */
health_unregister(health_consumerd);
/* Never return */
This page took
0.025419 seconds
and
4
git commands to generate.