projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.kernel.dk/data/git/fio
[fio.git]
/
gettime.c
diff --git
a/gettime.c
b/gettime.c
index c6d45f8761f799e9e324b2f95f9b4bff40a56158..9f8362090095c2d679c2b568274649d931aa8942 100644
(file)
--- a/
gettime.c
+++ b/
gettime.c
@@
-377,7
+377,7
@@
void fio_clock_init(void)
log_info("fio: clocksource=cpu may not be reliable\n");
}
log_info("fio: clocksource=cpu may not be reliable\n");
}
-uint64_t utime_since(
struct timeval *s,
struct timeval *e)
+uint64_t utime_since(
const struct timeval *s, const
struct timeval *e)
{
long sec, usec;
uint64_t ret;
{
long sec, usec;
uint64_t ret;
@@
-400,7
+400,7
@@
uint64_t utime_since(struct timeval *s, struct timeval *e)
return ret;
}
return ret;
}
-uint64_t utime_since_now(struct timeval *s)
+uint64_t utime_since_now(
const
struct timeval *s)
{
struct timeval t;
{
struct timeval t;
@@
-408,7
+408,7
@@
uint64_t utime_since_now(struct timeval *s)
return utime_since(s, &t);
}
return utime_since(s, &t);
}
-uint64_t mtime_since(
struct timeval *s,
struct timeval *e)
+uint64_t mtime_since(
const struct timeval *s, const
struct timeval *e)
{
long sec, usec, ret;
{
long sec, usec, ret;
@@
-429,7
+429,7
@@
uint64_t mtime_since(struct timeval *s, struct timeval *e)
return ret;
}
return ret;
}
-uint64_t mtime_since_now(struct timeval *s)
+uint64_t mtime_since_now(
const
struct timeval *s)
{
struct timeval t;
void *p = __builtin_return_address(0);
{
struct timeval t;
void *p = __builtin_return_address(0);
@@
-438,7
+438,7
@@
uint64_t mtime_since_now(struct timeval *s)
return mtime_since(s, &t);
}
return mtime_since(s, &t);
}
-uint64_t time_since_now(struct timeval *s)
+uint64_t time_since_now(
const
struct timeval *s)
{
return mtime_since_now(s) / 1000;
}
{
return mtime_since_now(s) / 1000;
}
@@
-534,16
+534,20
@@
int fio_monotonic_clocktest(void)
struct clock_thread *threads;
unsigned int nr_cpus = cpus_online();
struct clock_entry *entries;
struct clock_thread *threads;
unsigned int nr_cpus = cpus_online();
struct clock_entry *entries;
- unsigned long tentries, failed;
+ unsigned long tentries, failed
= 0
;
struct clock_entry *prev, *this;
uint32_t seq = 0;
struct clock_entry *prev, *this;
uint32_t seq = 0;
- int i;
+
unsigned
int i;
log_info("cs: reliable_tsc: %s\n", tsc_reliable ? "yes" : "no");
log_info("cs: reliable_tsc: %s\n", tsc_reliable ? "yes" : "no");
+#ifdef FIO_INC_DEBUG
fio_debug |= 1U << FD_TIME;
fio_debug |= 1U << FD_TIME;
+#endif
calibrate_cpu_clock();
calibrate_cpu_clock();
+#ifdef FIO_INC_DEBUG
fio_debug &= ~(1U << FD_TIME);
fio_debug &= ~(1U << FD_TIME);
+#endif
threads = malloc(nr_cpus * sizeof(struct clock_thread));
tentries = CLOCK_ENTRIES * nr_cpus;
threads = malloc(nr_cpus * sizeof(struct clock_thread));
tentries = CLOCK_ENTRIES * nr_cpus;
@@
-560,7
+564,11
@@
int fio_monotonic_clocktest(void)
pthread_mutex_init(&t->lock, NULL);
pthread_mutex_init(&t->started, NULL);
pthread_mutex_lock(&t->lock);
pthread_mutex_init(&t->lock, NULL);
pthread_mutex_init(&t->started, NULL);
pthread_mutex_lock(&t->lock);
- pthread_create(&t->thread, NULL, clock_thread_fn, t);
+ if (pthread_create(&t->thread, NULL, clock_thread_fn, t)) {
+ failed++;
+ nr_cpus = i;
+ break;
+ }
}
for (i = 0; i < nr_cpus; i++) {
}
for (i = 0; i < nr_cpus; i++) {
@@
-575,7
+583,7
@@
int fio_monotonic_clocktest(void)
pthread_mutex_unlock(&t->lock);
}
pthread_mutex_unlock(&t->lock);
}
- for (
failed =
i = 0; i < nr_cpus; i++) {
+ for (i = 0; i < nr_cpus; i++) {
struct clock_thread *t = &threads[i];
void *ret;
struct clock_thread *t = &threads[i];
void *ret;