summaryrefslogtreecommitdiffstats
path: root/recipes-bsp/thermald/files/0002-Use-correct-format-specifier-for-X32.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-bsp/thermald/files/0002-Use-correct-format-specifier-for-X32.patch')
-rw-r--r--recipes-bsp/thermald/files/0002-Use-correct-format-specifier-for-X32.patch87
1 files changed, 0 insertions, 87 deletions
diff --git a/recipes-bsp/thermald/files/0002-Use-correct-format-specifier-for-X32.patch b/recipes-bsp/thermald/files/0002-Use-correct-format-specifier-for-X32.patch
deleted file mode 100644
index 893b343..0000000
--- a/recipes-bsp/thermald/files/0002-Use-correct-format-specifier-for-X32.patch
+++ /dev/null
@@ -1,87 +0,0 @@
1From fa6cfd59e52be6a45a067cc770adc62437295085 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Thu, 18 Jan 2018 14:29:09 +0800
4Subject: [PATCH 2/2] Use correct format specifier for X32
5
6time_t in x32 is of long long type. Using %ld specifier leads
7to errors like:
8
9| ../git/src/thd_model.cpp: In member function 'unsigned int cthd_model::update_set_point(unsigned int)':
10| ../git/src/thermald.h:74:68: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'time_t {aka long long int}' [-Werror=format=]
11| #define thd_log_info(...) g_log(NULL, G_LOG_LEVEL_INFO, __VA_ARGS__)
12| ^
13| ../git/src/thd_model.cpp:112:3: note: in expansion of macro 'thd_log_info'
14| thd_log_info("update_pid %ld %ld %d %g %d\n", now, last_time, error,
15| ^~~~~~~~~~~~
16
17Use the correct format specifier based on the address model.
18
19Upstream-Status: Submitted [https://github.com/intel/thermal_daemon/pull/147]
20
21Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
22---
23 src/thd_model.cpp | 14 ++++++++++++++
24 src/thd_trip_point.cpp | 6 ++++++
25 2 files changed, 20 insertions(+)
26
27diff --git a/src/thd_model.cpp b/src/thd_model.cpp
28index 5f1d0d7..46b95dc 100644
29--- a/src/thd_model.cpp
30+++ b/src/thd_model.cpp
31@@ -109,8 +109,14 @@ unsigned int cthd_model::update_set_point(unsigned int curr_temp) {
32 /*Compute PID Output*/
33 output = kp * error + ki * err_sum + kd * d_err;
34 _setpoint = max_temp - (unsigned int) output;
35+
36+#if defined __x86_64__ && defined __ILP32__
37+ thd_log_info("update_pid %lld %lld %d %g %d\n", now, last_time, error,
38+ output, _setpoint);
39+#else
40 thd_log_info("update_pid %ld %ld %d %g %d\n", now, last_time, error,
41 output, _setpoint);
42+#endif
43 if ((_setpoint < 0) || (abs(set_point - _setpoint) > max_compensation))
44 set_point -= max_compensation;
45 else
46@@ -134,10 +140,18 @@ void cthd_model::add_sample(int temperature) {
47 updated_set_point = false;
48 if (trend_increase_start == 0 && temperature > hot_zone) {
49 trend_increase_start = tm;
50+#if defined __x86_64__ && defined __ILP32__
51+ thd_log_debug("Trend increase start %lld\n", trend_increase_start);
52+#else
53 thd_log_debug("Trend increase start %ld\n", trend_increase_start);
54+#endif
55 } else if (trend_increase_start && temperature < hot_zone) {
56 int _set_point;
57+#if defined __x86_64__ && defined __ILP32__
58+ thd_log_debug("Trend increase stopped %lld\n", trend_increase_start);
59+#else
60 thd_log_debug("Trend increase stopped %ld\n", trend_increase_start);
61+#endif
62 trend_increase_start = 0;
63 _set_point = read_set_point(); // Restore set point to a calculated max
64 if (_set_point > set_point) {
65diff --git a/src/thd_trip_point.cpp b/src/thd_trip_point.cpp
66index dd1b881..170adcf 100644
67--- a/src/thd_trip_point.cpp
68+++ b/src/thd_trip_point.cpp
69@@ -132,9 +132,15 @@ bool cthd_trip_point::thd_trip_point_check(int id, unsigned int read_temp,
70 time_t tm;
71 time(&tm);
72 if ((tm - cdevs[i].last_op_time) < cdevs[i].sampling_priod) {
73+#if defined __x86_64__ && defined __ILP32__
74+ thd_log_info("Too early to act index %d tm %lld\n",
75+ cdev->thd_cdev_get_index(),
76+ tm - cdevs[i].last_op_time);
77+#else
78 thd_log_info("Too early to act index %d tm %ld\n",
79 cdev->thd_cdev_get_index(),
80 tm - cdevs[i].last_op_time);
81+#endif
82 break;
83 }
84 cdevs[i].last_op_time = tm;
85--
862.7.4
87