projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
steadystate: make test script work better under Windows
[fio.git]
/
libfio.c
diff --git
a/libfio.c
b/libfio.c
index c626d15c8a6cd5219b94171b91f4bf7a90ecbbb0..20ce7cdf7d99f315777ed9d12813866154df765a 100644
(file)
--- a/
libfio.c
+++ b/
libfio.c
@@
-33,6
+33,7
@@
#include "smalloc.h"
#include "os/os.h"
#include "filelock.h"
#include "smalloc.h"
#include "os/os.h"
#include "filelock.h"
+#include "helper_thread.h"
/*
* Just expose an empty list, if the OS does not support disk util stats
/*
* Just expose an empty list, if the OS does not support disk util stats
@@
-46,6
+47,7
@@
unsigned long arch_flags = 0;
uintptr_t page_mask = 0;
uintptr_t page_size = 0;
uintptr_t page_mask = 0;
uintptr_t page_size = 0;
+/* see os/os.h */
static const char *fio_os_strings[os_nr] = {
"Invalid",
"Linux",
static const char *fio_os_strings[os_nr] = {
"Invalid",
"Linux",
@@
-61,6
+63,7
@@
static const char *fio_os_strings[os_nr] = {
"DragonFly",
};
"DragonFly",
};
+/* see arch/arch.h */
static const char *fio_arch_strings[arch_nr] = {
"Invalid",
"x86-64",
static const char *fio_arch_strings[arch_nr] = {
"Invalid",
"x86-64",
@@
-74,6
+77,8
@@
static const char *fio_arch_strings[arch_nr] = {
"arm",
"sh",
"hppa",
"arm",
"sh",
"hppa",
+ "mips",
+ "aarch64",
"generic"
};
"generic"
};
@@
-146,9
+151,13
@@
void reset_all_stats(struct thread_data *td)
fio_gettime(&tv, NULL);
memcpy(&td->epoch, &tv, sizeof(tv));
memcpy(&td->start, &tv, sizeof(tv));
fio_gettime(&tv, NULL);
memcpy(&td->epoch, &tv, sizeof(tv));
memcpy(&td->start, &tv, sizeof(tv));
+ memcpy(&td->iops_sample_time, &tv, sizeof(tv));
+ memcpy(&td->bw_sample_time, &tv, sizeof(tv));
+ memcpy(&td->ss.prev_time, &tv, sizeof(tv));
lat_target_reset(td);
clear_rusage_stat(td);
lat_target_reset(td);
clear_rusage_stat(td);
+ helper_reset();
}
void reset_fio_state(void)
}
void reset_fio_state(void)
@@
-270,14
+279,18
@@
int fio_running_or_pending_io_threads(void)
{
struct thread_data *td;
int i;
{
struct thread_data *td;
int i;
+ int nr_io_threads = 0;
for_each_td(td, i) {
if (td->flags & TD_F_NOIO)
continue;
for_each_td(td, i) {
if (td->flags & TD_F_NOIO)
continue;
+ nr_io_threads++;
if (td->runstate < TD_EXITED)
return 1;
}
if (td->runstate < TD_EXITED)
return 1;
}
+ if (!nr_io_threads)
+ return -1; /* we only had cpuio threads to begin with */
return 0;
}
return 0;
}