mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-04 06:06:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

[3.6] bpo-31786: Make functions in the select module blocking when timeout is a small negative value. (GH-4003). (#4022)

Browse source 
(cherry picked from commit 2c15b29aea)
This commit is contained in:
Pablo Galindo 2017-10-18 09:12:47 +01:00 • committed by Serhiy Storchaka
parent 1781480254
commit 95602b368b
7 changed files with 78 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Python/pytime.c
View file

@ -84,12 +84,19 @@ _PyTime_Round(double x, _PyTime_round_t round)
volatile double d;
d = x;
if (round == _PyTime_ROUND_HALF_EVEN)
if (round == _PyTime_ROUND_HALF_EVEN){
d = _PyTime_RoundHalfEven(d);
else if (round == _PyTime_ROUND_CEILING)
}
else if (round == _PyTime_ROUND_CEILING){
d = ceil(d);
else
}
else if (round == _PyTime_ROUND_FLOOR) {
d = floor(d);
}
else {
assert(round == _PyTime_ROUND_UP);
d = (d >= 0.0) ? ceil(d) : floor(d);
}
return d;
}
@ -395,16 +402,29 @@ _PyTime_Divide(const _PyTime_t t, const _PyTime_t k,
return x;
}
else if (round == _PyTime_ROUND_CEILING) {
if (t >= 0)
if (t >= 0){
return (t + k - 1) / k;
else
}
else{
return t / k;
}
}
else if (round == _PyTime_ROUND_FLOOR){
if (t >= 0) {
return t / k;
}
else{
return (t - (k - 1)) / k;
}
}
else {
if (t >= 0)
return t / k;
else
assert(round == _PyTime_ROUND_UP);
if (t >= 0) {
return (t + k - 1) / k;
}
else {
return (t - (k - 1)) / k;
}
}
}