X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer-timer.c;h=c8131fe609248cb9386486d76ab27ef84dcfa511;hb=de3fb857f034c208c135a10a3cdec2dfe43fbda6;hp=8bf3ae80c2c4f4f35bf91780057f11f5f6a7b786;hpb=288bdb302a18194fe80e24af297e819575467059;p=lttng-tools.git

diff --git a/src/common/consumer-timer.c b/src/common/consumer-timer.c
index 8bf3ae80c..c8131fe60 100644
--- a/src/common/consumer-timer.c
+++ b/src/common/consumer-timer.c
@@ -439,7 +439,7 @@ void consumer_timer_switch_start(struct lttng_consumer_channel *channel,
 	channel->switch_timer_enabled = 1;
 
 	its.it_value.tv_sec = switch_timer_interval / 1000000;
-	its.it_value.tv_nsec = switch_timer_interval % 1000000;
+	its.it_value.tv_nsec = (switch_timer_interval % 1000000) * 1000;
 	its.it_interval.tv_sec = its.it_value.tv_sec;
 	its.it_interval.tv_nsec = its.it_value.tv_nsec;
 
@@ -496,7 +496,7 @@ void consumer_timer_live_start(struct lttng_consumer_channel *channel,
 	channel->live_timer_enabled = 1;
 
 	its.it_value.tv_sec = live_timer_interval / 1000000;
-	its.it_value.tv_nsec = live_timer_interval % 1000000;
+	its.it_value.tv_nsec = (live_timer_interval % 1000000) * 1000;
 	its.it_interval.tv_sec = its.it_value.tv_sec;
 	its.it_interval.tv_nsec = its.it_value.tv_nsec;
 
@@ -557,6 +557,8 @@ void *consumer_timer_thread(void *data)
 	siginfo_t info;
 	struct lttng_consumer_local_data *ctx = data;
 
+	rcu_register_thread();
+
 	health_register(health_consumerd, HEALTH_CONSUMERD_TYPE_METADATA_TIMER);
 
 	if (testpoint(consumerd_thread_metadata_timer)) {
@@ -599,6 +601,8 @@ error_testpoint:
 	health_error();
 	health_unregister(health_consumerd);
 
+	rcu_unregister_thread();
+
 	/* Never return */
 	return NULL;
 }