d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rework overflow checks of r247898 to not let too "intelligent" compiler to

Browse Source 
optimize it out.

Submitted by:	bde
This commit is contained in:
Alexander Motin 2013-03-09 09:07:13 +00:00
parent b3420862a7
commit 21a37a7196
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=248092
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/kern/kern_event.c
View File

@ -1329,12 +1329,13 @@ kqueue_scan(struct kqueue *kq, int maxevents, struct kevent_copyops *k_ops,
goto done_nl;
}
if (timespecisset(tsp)) {
if (tsp->tv_sec < INT32_MAX) {
if (tsp->tv_sec <= INT32_MAX) {
rsbt = tstosbt(*tsp);
if (TIMESEL(&asbt, rsbt))
asbt += tc_tick_sbt;
asbt += rsbt;
if (asbt < rsbt)
if (asbt <= INT64_MAX - rsbt)
asbt += rsbt;
else
asbt = 0;
rsbt >>= tc_precexp;
} else

9
sys/kern/sys_generic.c
View File

@ -1051,16 +1051,17 @@ kern_select(struct thread *td, int nd, fd_set *fd_in, fd_set *fd_ou,
error = EINVAL;
goto done;
}
if (rtv.tv_sec == 0 && rtv.tv_usec == 0)
if (!timevalisset(&rtv))
asbt = 0;
else if (rtv.tv_sec < INT32_MAX) {
else if (rtv.tv_sec <= INT32_MAX) {
rsbt = tvtosbt(rtv);
precision = rsbt;
precision >>= tc_precexp;
if (TIMESEL(&asbt, rsbt))
asbt += tc_tick_sbt;
asbt += rsbt;
if (asbt < rsbt)
if (asbt <= INT64_MAX - rsbt)
asbt += rsbt;
else
asbt = -1;
} else
asbt = -1;