diff options
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-tools/lttng-tools-Fix-live-timer-calculation-error.patch')
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-tools/lttng-tools-Fix-live-timer-calculation-error.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-tools/lttng-tools-Fix-live-timer-calculation-error.patch b/meta/recipes-kernel/lttng/lttng-tools/lttng-tools-Fix-live-timer-calculation-error.patch new file mode 100644 index 0000000000..4719d95489 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-tools/lttng-tools-Fix-live-timer-calculation-error.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | From 161496fbe1465817a77a50a1172734dae81a13ef Mon Sep 17 00:00:00 2001 | ||
2 | From: Mikael Beckius <mikael.beckius@windriver.com> | ||
3 | Date: Tue, 12 May 2015 11:11:48 +0200 | ||
4 | Subject: [PATCH] lttng-tools: Fix live timer calculation error | ||
5 | |||
6 | There is an calculation error for live timer. Variable switch_timer_interval is | ||
7 | based on microsecond, and it is not right to assign switch_timer_interval mod | ||
8 | 1000000 to var tv_nsec which is based on nanosecond. | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Mikael Beckius <mikael.beckius@windriver.com> | ||
13 | Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com> | ||
14 | --- | ||
15 | src/common/consumer-timer.c | 4 ++-- | ||
16 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
17 | |||
18 | diff --git a/src/common/consumer-timer.c b/src/common/consumer-timer.c | ||
19 | index 1408052..c6202ba 100644 | ||
20 | --- a/src/common/consumer-timer.c | ||
21 | +++ b/src/common/consumer-timer.c | ||
22 | @@ -368,7 +368,7 @@ void consumer_timer_switch_start(struct lttng_consumer_channel *channel, | ||
23 | channel->switch_timer_enabled = 1; | ||
24 | |||
25 | its.it_value.tv_sec = switch_timer_interval / 1000000; | ||
26 | - its.it_value.tv_nsec = switch_timer_interval % 1000000; | ||
27 | + its.it_value.tv_nsec = (switch_timer_interval % 1000000) * 1000; | ||
28 | its.it_interval.tv_sec = its.it_value.tv_sec; | ||
29 | its.it_interval.tv_nsec = its.it_value.tv_nsec; | ||
30 | |||
31 | @@ -425,7 +425,7 @@ void consumer_timer_live_start(struct lttng_consumer_channel *channel, | ||
32 | channel->live_timer_enabled = 1; | ||
33 | |||
34 | its.it_value.tv_sec = live_timer_interval / 1000000; | ||
35 | - its.it_value.tv_nsec = live_timer_interval % 1000000; | ||
36 | + its.it_value.tv_nsec = (live_timer_interval % 1000000) * 1000; | ||
37 | its.it_interval.tv_sec = its.it_value.tv_sec; | ||
38 | its.it_interval.tv_nsec = its.it_value.tv_nsec; | ||
39 | |||
40 | -- | ||
41 | 1.9.1 | ||
42 | |||