blob: 91028d82bcd9b76c03dd65b97da8a5c1e5d83c85 [file] [log] [blame]
Andrew Geissler1548c072019-02-22 16:03:50 -06001From e00d3f52ccc6496a60992ac5a9d771b1d067eceb Mon Sep 17 00:00:00 2001
2From: Haiqing Bai <Haiqing.Bai@windriver.com>
3Date: Thu, 22 Nov 2018 08:42:48 +0000
4Subject: [PATCH] Fixed 100% CPU using issue by adding minimum POSIX timer
5 interval
6
7Added minimum POSIX timer interval to prevent from timers firing
8to quickly for the process to handle, resulting in 100% CPU and
9endless signal queue.
10
Patrick Williamsb9af8752023-01-30 13:28:01 -060011Upstream-Status: Backport [From commit 1f0baae98a7b23e85f2bfd8f5de64795421c270e:
Andrew Geissler1548c072019-02-22 16:03:50 -060012 - critical: added minimum POSIX timer interval to prevent from
13 timers firing to quickly for the process to handle,
14 resulting in 100% CPU and endless signal queue]
15
16Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com>
17---
18 src/dep/eventtimer.h | 3 ++-
19 src/dep/eventtimer_itimer.c | 2 +-
20 src/dep/eventtimer_posix.c | 4 ++++
21 3 files changed, 7 insertions(+), 2 deletions(-)
22
23diff --git a/src/dep/eventtimer.h b/src/dep/eventtimer.h
24index 64e483a..0a21318 100644
25--- a/src/dep/eventtimer.h
26+++ b/src/dep/eventtimer.h
27@@ -30,7 +30,8 @@
28 * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */
30
31-#define EVENTTIMER_MAX_DESC 20
32+#define EVENTTIMER_MAX_DESC 20
33+#define EVENTTIMER_MIN_INTERVAL_US 250 /* 4000/sec */
34
35 typedef struct EventTimer EventTimer;
36
37diff --git a/src/dep/eventtimer_itimer.c b/src/dep/eventtimer_itimer.c
38index cf3c6db..3bb7ec6 100644
39--- a/src/dep/eventtimer_itimer.c
40+++ b/src/dep/eventtimer_itimer.c
41@@ -53,7 +53,7 @@
42
43 #include "../ptpd.h"
44
45-#define US_TIMER_INTERVAL (62500)
46+#define US_TIMER_INTERVAL (31250)
47
48 static volatile unsigned int elapsed;
49
50diff --git a/src/dep/eventtimer_posix.c b/src/dep/eventtimer_posix.c
51index 637eef3..f4a702d 100644
52--- a/src/dep/eventtimer_posix.c
53+++ b/src/dep/eventtimer_posix.c
54@@ -100,6 +100,10 @@ eventTimerStart_posix(EventTimer *timer, double interval)
55 ts.tv_sec = interval;
56 ts.tv_nsec = (interval - ts.tv_sec) * 1E9;
57
58+ if(!ts.tv_sec && ts.tv_nsec < EVENTTIMER_MIN_INTERVAL_US * 1000) {
59+ ts.tv_nsec = EVENTTIMER_MIN_INTERVAL_US * 1000;
60+ }
61+
62 DBGV("Timer %s start requested at %d.%4d sec interval\n", timer->id, ts.tv_sec, ts.tv_nsec);
63
64 its.it_interval = ts;
65--
662.11.0
67