projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Support for mmap of hugetlb files as memory backing
[fio.git]
/
time.c
diff --git
a/time.c
b/time.c
index ad5ee3fe51773c9019067f593834428afad8fc9b..d0ecbe5c831af59f857164af9fa433d96eaceda0 100644
(file)
--- a/
time.c
+++ b/
time.c
@@
-7,7
+7,7
@@
static struct timeval genesis;
unsigned long utime_since(struct timeval *s, struct timeval *e)
{
unsigned long utime_since(struct timeval *s, struct timeval *e)
{
-
double
sec, usec;
+
long
sec, usec;
sec = e->tv_sec - s->tv_sec;
usec = e->tv_usec - s->tv_usec;
sec = e->tv_sec - s->tv_sec;
usec = e->tv_usec - s->tv_usec;
@@
-21,17
+21,17
@@
unsigned long utime_since(struct timeval *s, struct timeval *e)
return sec + usec;
}
return sec + usec;
}
-
static
unsigned long utime_since_now(struct timeval *s)
+unsigned long utime_since_now(struct timeval *s)
{
struct timeval t;
{
struct timeval t;
-
gettimeofday
(&t, NULL);
+
fio_gettime
(&t, NULL);
return utime_since(s, &t);
}
unsigned long mtime_since(struct timeval *s, struct timeval *e)
{
return utime_since(s, &t);
}
unsigned long mtime_since(struct timeval *s, struct timeval *e)
{
-
double
sec, usec;
+
long
sec, usec;
sec = e->tv_sec - s->tv_sec;
usec = e->tv_usec - s->tv_usec;
sec = e->tv_sec - s->tv_sec;
usec = e->tv_usec - s->tv_usec;
@@
-49,8
+49,9
@@
unsigned long mtime_since(struct timeval *s, struct timeval *e)
unsigned long mtime_since_now(struct timeval *s)
{
struct timeval t;
unsigned long mtime_since_now(struct timeval *s)
{
struct timeval t;
+ void *p = __builtin_return_address(0);
-
gettimeofday(&t, NULL
);
+
fio_gettime(&t, p
);
return mtime_since(s, &t);
}
return mtime_since(s, &t);
}
@@
-66,7
+67,7
@@
void __usec_sleep(unsigned int usec)
{
struct timeval start;
{
struct timeval start;
-
gettimeofday
(&start, NULL);
+
fio_gettime
(&start, NULL);
while (utime_since_now(&start) < usec)
nop;
}
while (utime_since_now(&start) < usec)
nop;
}
@@
-99,14
+100,14
@@
void usec_sleep(struct thread_data *td, unsigned long usec)
}
void rate_throttle(struct thread_data *td, unsigned long time_spent,
}
void rate_throttle(struct thread_data *td, unsigned long time_spent,
- unsigned int bytes)
+ unsigned int bytes
, int ddir
)
{
unsigned long usec_cycle;
if (!td->rate)
return;
{
unsigned long usec_cycle;
if (!td->rate)
return;
- usec_cycle = td->rate_usec_cycle * (bytes / td->min_bs);
+ usec_cycle = td->rate_usec_cycle * (bytes / td->min_bs
[ddir]
);
if (time_spent < usec_cycle) {
unsigned long s = usec_cycle - time_spent;
if (time_spent < usec_cycle) {
unsigned long s = usec_cycle - time_spent;
@@
-128,7
+129,12
@@
unsigned long mtime_since_genesis(void)
return mtime_since_now(&genesis);
}
return mtime_since_now(&genesis);
}
-
void
time_init(void)
+
static void fio_init
time_init(void)
{
{
- gettimeofday(&genesis, NULL);
+ fio_gettime(&genesis, NULL);
+}
+
+void fill_start_time(struct timeval *t)
+{
+ memcpy(t, &genesis, sizeof(genesis));
}
}