X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libringbuffer%2Fring_buffer_frontend.c;h=ed60d7e22aa63ee127f2ae8b00f186522bdaae13;hb=25fb5cab5c956b84ca2821676d24ff572824aaed;hp=c7394b1fd668d6e307e251221fcb1d79df07fb9e;hpb=34daae3e48423fc35b363e19136e324f9e31b05a;p=lttng-ust.git

diff --git a/libringbuffer/ring_buffer_frontend.c b/libringbuffer/ring_buffer_frontend.c
index c7394b1f..ed60d7e2 100644
--- a/libringbuffer/ring_buffer_frontend.c
+++ b/libringbuffer/ring_buffer_frontend.c
@@ -74,10 +74,6 @@
 #include "tlsfixup.h"
 #include "../liblttng-ust/compat.h"	/* For ENODATA */
 
-#ifndef max
-#define max(a, b)	((a) > (b) ? (a) : (b))
-#endif
-
 /* Print DBG() messages about events lost only every 1048576 hits */
 #define DBG_PRINT_NR_LOST	(1UL << 20)
 
@@ -642,7 +638,7 @@ void lib_ring_buffer_channel_switch_timer_start(struct channel *chan)
 	}
 
 	its.it_value.tv_sec = chan->switch_timer_interval / 1000000;
-	its.it_value.tv_nsec = chan->switch_timer_interval % 1000000;
+	its.it_value.tv_nsec = (chan->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;
 
@@ -696,7 +692,7 @@ void lib_ring_buffer_channel_read_timer_start(struct channel *chan)
 	}
 
 	its.it_value.tv_sec = chan->read_timer_interval / 1000000;
-	its.it_value.tv_nsec = chan->read_timer_interval % 1000000;
+	its.it_value.tv_nsec = (chan->read_timer_interval % 1000000) * 1000;
 	its.it_interval.tv_sec = its.it_value.tv_sec;
 	its.it_interval.tv_nsec = its.it_value.tv_nsec;