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' into gfio
[fio.git]
/
libfio.c
diff --git
a/libfio.c
b/libfio.c
index f680be84c66acb59bf94960b62f8b074ae3187e5..37e5c0db5a6e32fd67b6bd1f24addf4d73066f88 100644
(file)
--- a/
libfio.c
+++ b/
libfio.c
@@
-75,6
+75,7
@@
static const char *fio_arch_strings[arch_nr] = {
static void reset_io_counters(struct thread_data *td)
{
int ddir;
static void reset_io_counters(struct thread_data *td)
{
int ddir;
+
for (ddir = 0; ddir < DDIR_RWDIR_CNT; ddir++) {
td->stat_io_bytes[ddir] = 0;
td->this_io_bytes[ddir] = 0;
for (ddir = 0; ddir < DDIR_RWDIR_CNT; ddir++) {
td->stat_io_bytes[ddir] = 0;
td->this_io_bytes[ddir] = 0;
@@
-82,15
+83,17
@@
static void reset_io_counters(struct thread_data *td)
td->this_io_blocks[ddir] = 0;
td->rate_bytes[ddir] = 0;
td->rate_blocks[ddir] = 0;
td->this_io_blocks[ddir] = 0;
td->rate_bytes[ddir] = 0;
td->rate_blocks[ddir] = 0;
+ td->io_issues[ddir] = 0;
}
td->zone_bytes = 0;
td->last_was_sync = 0;
}
td->zone_bytes = 0;
td->last_was_sync = 0;
+ td->rwmix_issues = 0;
/*
* reset file done count if we are to start over
*/
/*
* reset file done count if we are to start over
*/
- if (td->o.time_based || td->o.loops)
+ if (td->o.time_based || td->o.loops
|| td->o.do_verify
)
td->nr_done_files = 0;
}
td->nr_done_files = 0;
}
@@
-135,6
+138,7
@@
void reset_fio_state(void)
{
groupid = 0;
thread_number = 0;
{
groupid = 0;
thread_number = 0;
+ stat_number = 0;
done_secs = 0;
}
done_secs = 0;
}
@@
-167,6
+171,7
@@
void td_set_runstate(struct thread_data *td, int runstate)
void fio_terminate_threads(int group_id)
{
struct thread_data *td;
void fio_terminate_threads(int group_id)
{
struct thread_data *td;
+ pid_t pid = getpid();
int i;
dprint(FD_PROCESS, "terminate group_id=%d\n", group_id);
int i;
dprint(FD_PROCESS, "terminate group_id=%d\n", group_id);
@@
-181,15
+186,15
@@
void fio_terminate_threads(int group_id)
/*
* if the thread is running, just let it exit
*/
/*
* if the thread is running, just let it exit
*/
- if (!td->pid)
+ if (!td->pid
|| pid == td->pid
)
continue;
else if (td->runstate < TD_RAMP)
kill(td->pid, SIGTERM);
else {
struct ioengine_ops *ops = td->io_ops;
continue;
else if (td->runstate < TD_RAMP)
kill(td->pid, SIGTERM);
else {
struct ioengine_ops *ops = td->io_ops;
- if (ops &&
(ops->flags & FIO_SIGTERM)
)
-
kill(td->pid, SIGTERM
);
+ if (ops &&
ops->terminate
)
+
ops->terminate(td
);
}
}
}
}
}
}
@@
-209,10
+214,10
@@
static int endian_check(void)
else if (u.c[0] == 0x12)
le = 1;
else if (u.c[0] == 0x12)
le = 1;
-#if defined(
FIO
_LITTLE_ENDIAN)
+#if defined(
CONFIG
_LITTLE_ENDIAN)
if (be)
return 1;
if (be)
return 1;
-#elif defined(
FIO
_BIG_ENDIAN)
+#elif defined(
CONFIG
_BIG_ENDIAN)
if (le)
return 1;
#else
if (le)
return 1;
#else