projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove leftover warnings
[fio.git]
/
time.c
diff --git
a/time.c
b/time.c
index f5dc04969f3d47020fb4f61fa3ddf5dcfcdf0e09..279ee48492302ebd5a1080e5422cc48ecd6b7a59 100644
(file)
--- a/
time.c
+++ b/
time.c
@@
-8,8
+8,16
@@
static unsigned long ns_granularity;
void timeval_add_msec(struct timeval *tv, unsigned int msec)
{
void timeval_add_msec(struct timeval *tv, unsigned int msec)
{
- tv->tv_usec += 1000 * msec;
- if (tv->tv_usec >= 1000000) {
+ unsigned long adj_usec = 1000 * msec;
+
+ tv->tv_usec += adj_usec;
+ if (adj_usec >= 1000000) {
+ unsigned long adj_sec = adj_usec / 1000000;
+
+ tv->tv_usec -= adj_sec * 1000000;
+ tv->tv_sec += adj_sec;
+ }
+ if (tv->tv_usec >= 1000000){
tv->tv_usec -= 1000000;
tv->tv_sec++;
}
tv->tv_usec -= 1000000;
tv->tv_sec++;
}