mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-02-22 19:32:19 +00:00
util: make it more robust to calculate timeout value
When we change system clock to years ago, a certain CPU may use up 100% cputime. The reason is that in function virEventPollCalculateTimeout(), we assign the unsigned long long result to an INT variable, *timeout = then - now; // timeout is INT, and then/now are long long if (*timeout < 0) *timeout = 0; there's a chance that variable @then minus variable @now may be a very large number that overflows INT value expression, then *timeout will be negative and be assigned to 0. Next the 'poll' in function virEventPollRunOnce() will get into an 'endless' while loop there. thus, the cpu that virEventPollRunOnce() thread runs on will go up to 100%. Although as we discussed before in https://www.redhat.com/archives/libvir-list/2015-May/msg00400.html it should be prohibited to set-time while other applications are running, but it does seems to have no harm to make the codes more robust. Signed-off-by: Wang Yufei <james.wangyufei@huawei.com> Signed-off-by: Zhang Bo <oscar.zhangbo@huawei.com>
This commit is contained in:
parent
b071ec4347
commit
39d0396f39
@ -357,9 +357,10 @@ static int virEventPollCalculateTimeout(int *timeout)
|
||||
return -1;
|
||||
|
||||
EVENT_DEBUG("Schedule timeout then=%llu now=%llu", then, now);
|
||||
*timeout = then - now;
|
||||
if (*timeout < 0)
|
||||
if (then <= now)
|
||||
*timeout = 0;
|
||||
else
|
||||
*timeout = ((then - now) > INT_MAX) ? INT_MAX : (then - now);
|
||||
} else {
|
||||
*timeout = -1;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user