aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Delalande <colona@ycc.fr>2014-06-26 04:30:43 +0200
committerRoberto E. Vargas Caballero <k0ga@shike2.com>2014-06-26 12:33:55 +0200
commit19d095717f656d844cd9d696d9c921a0821a5ea7 (patch)
tree71ab0f9a40414079253c2cfe435cdfaa4482ec30
parent5edeec1b20fcb5900d4f1408594d1e76b6c544f0 (diff)
downloadst-19d095717f656d844cd9d696d9c921a0821a5ea7.tar.gz
st-19d095717f656d844cd9d696d9c921a0821a5ea7.zip
Fixed wrong nanosecond factor 10E6.
Commit 5edeec1 introduced a wrong factor for nanosecond computation, the correct value is 1E6. Time and timeout values are 10 times less than they should be and this cause high CPU usage. Reported by pyroh on IRC. Thanks! Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
-rw-r--r--st.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/st.c b/st.c
index 17142a4..f9c9f7a 100644
--- a/st.c
+++ b/st.c
@@ -76,7 +76,7 @@ char *argv0;
76#define LIMIT(x, a, b) (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x) 76#define LIMIT(x, a, b) (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
77#define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || (a).bg != (b).bg) 77#define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || (a).bg != (b).bg)
78#define IS_SET(flag) ((term.mode & (flag)) != 0) 78#define IS_SET(flag) ((term.mode & (flag)) != 0)
79#define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + (t1.tv_nsec-t2.tv_nsec)/10E6) 79#define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + (t1.tv_nsec-t2.tv_nsec)/1E6)
80#define CEIL(x) (((x) != (int) (x)) ? (x) + 1 : (x)) 80#define CEIL(x) (((x) != (int) (x)) ? (x) + 1 : (x))
81#define MODBIT(x, set, bit) ((set) ? ((x) |= (bit)) : ((x) &= ~(bit))) 81#define MODBIT(x, set, bit) ((set) ? ((x) |= (bit)) : ((x) &= ~(bit)))
82 82
@@ -3753,7 +3753,7 @@ run(void) {
3753 3753
3754 clock_gettime(CLOCK_MONOTONIC, &now); 3754 clock_gettime(CLOCK_MONOTONIC, &now);
3755 drawtimeout.tv_sec = 0; 3755 drawtimeout.tv_sec = 0;
3756 drawtimeout.tv_nsec = (1000/xfps) * 10E6; 3756 drawtimeout.tv_nsec = (1000/xfps) * 1E6;
3757 tv = &drawtimeout; 3757 tv = &drawtimeout;
3758 3758
3759 dodraw = 0; 3759 dodraw = 0;
@@ -3790,7 +3790,7 @@ run(void) {
3790 > blinktimeout) { 3790 > blinktimeout) {
3791 drawtimeout.tv_nsec = 1000; 3791 drawtimeout.tv_nsec = 1000;
3792 } else { 3792 } else {
3793 drawtimeout.tv_nsec = (10E6 * \ 3793 drawtimeout.tv_nsec = (1E6 * \
3794 (blinktimeout - \ 3794 (blinktimeout - \
3795 TIMEDIFF(now, 3795 TIMEDIFF(now,
3796 lastblink))); 3796 lastblink)));