projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Fix warnings from icc
[fio.git]
/
stat.c
diff --git
a/stat.c
b/stat.c
index 518d14dd13ad43dbe1dbfe02b6e83aec0a802eda..b4facc7eab4da21a71ff7f343f7e2f264ab9ea40 100644
(file)
--- a/
stat.c
+++ b/
stat.c
@@
-60,7
+60,7
@@
static void update_io_tick_disk(struct disk_util *du)
dus->io_ticks += (__dus.io_ticks - ldus->io_ticks);
dus->time_in_queue += (__dus.time_in_queue - ldus->time_in_queue);
dus->io_ticks += (__dus.io_ticks - ldus->io_ticks);
dus->time_in_queue += (__dus.time_in_queue - ldus->time_in_queue);
-
gettimeofday
(&t, NULL);
+
fio_gettime
(&t, NULL);
du->msec += mtime_since(&du->time, &t);
memcpy(&du->time, &t, sizeof(t));
memcpy(ldus, &__dus, sizeof(__dus));
du->msec += mtime_since(&du->time, &t);
memcpy(&du->time, &t, sizeof(t));
memcpy(ldus, &__dus, sizeof(__dus));
@@
-102,7
+102,7
@@
static void disk_util_add(dev_t dev, char *path)
du->name = strdup(basename(path));
du->dev = dev;
du->name = strdup(basename(path));
du->dev = dev;
-
gettimeofday
(&du->time, NULL);
+
fio_gettime
(&du->time, NULL);
get_io_ticks(du, &du->last_dus);
list_add_tail(&du->list, &disk_list);
get_io_ticks(du, &du->last_dus);
list_add_tail(&du->list, &disk_list);
@@
-189,7
+189,7
@@
void init_disk_util(struct thread_data *td)
{
struct fio_file *f;
struct stat st;
{
struct fio_file *f;
struct stat st;
- char foo[
256], tmp[256
];
+ char foo[
PATH_MAX], tmp[PATH_MAX
];
dev_t dev;
char *p;
dev_t dev;
char *p;
@@
-209,7
+209,7
@@
void init_disk_util(struct thread_data *td)
/*
* must be a file, open "." in that path
*/
/*
* must be a file, open "." in that path
*/
- str
cpy(foo, f->file_name
);
+ str
ncpy(foo, f->file_name, PATH_MAX - 1
);
p = dirname(foo);
if (stat(p, &st)) {
perror("disk util stat");
p = dirname(foo);
if (stat(p, &st)) {
perror("disk util stat");
@@
-239,7
+239,7
@@
void init_disk_util(struct thread_data *td)
log_err("unknown sysfs layout\n");
return;
}
log_err("unknown sysfs layout\n");
return;
}
- str
cpy(tmp, p
);
+ str
ncpy(tmp, p, PATH_MAX - 1
);
sprintf(foo, "%s", tmp);
}
sprintf(foo, "%s", tmp);
}
@@
-258,9
+258,6
@@
void disk_util_timer_arm(void)
void update_rusage_stat(struct thread_data *td)
{
void update_rusage_stat(struct thread_data *td)
{
- if (!(td->runtime[0] + td->runtime[1]))
- return;
-
getrusage(RUSAGE_SELF, &td->ru_end);
td->usr_time += mtime_since(&td->ru_start.ru_utime, &td->ru_end.ru_utime);
getrusage(RUSAGE_SELF, &td->ru_end);
td->usr_time += mtime_since(&td->ru_start.ru_utime, &td->ru_end.ru_utime);
@@
-333,7
+330,7
@@
static void show_disk_util(void)
static void show_ddir_status(struct thread_data *td, struct group_run_stats *rs,
int ddir)
{
static void show_ddir_status(struct thread_data *td, struct group_run_stats *rs,
int ddir)
{
- char *ddir_str[] = { "read ", "write" };
+ c
onst c
har *ddir_str[] = { "read ", "write" };
unsigned long min, max;
unsigned long long bw;
double mean, dev;
unsigned long min, max;
unsigned long long bw;
double mean, dev;
@@
-362,6
+359,7
@@
static void show_thread_status(struct thread_data *td,
struct group_run_stats *rs)
{
double usr_cpu, sys_cpu;
struct group_run_stats *rs)
{
double usr_cpu, sys_cpu;
+ unsigned long runtime;
if (!(td->io_bytes[0] + td->io_bytes[1]) && !td->error)
return;
if (!(td->io_bytes[0] + td->io_bytes[1]) && !td->error)
return;
@@
-372,8
+370,9
@@
static void show_thread_status(struct thread_data *td,
if (td->io_bytes[td->ddir ^ 1])
show_ddir_status(td, rs, td->ddir ^ 1);
if (td->io_bytes[td->ddir ^ 1])
show_ddir_status(td, rs, td->ddir ^ 1);
- if (td->runtime[0] + td->runtime[1]) {
- double runt = td->runtime[0] + td->runtime[1];
+ runtime = mtime_since(&td->epoch, &td->end_time);
+ if (runtime) {
+ double runt = (double) runtime;
usr_cpu = (double) td->usr_time * 100 / runt;
sys_cpu = (double) td->sys_time * 100 / runt;
usr_cpu = (double) td->usr_time * 100 / runt;
sys_cpu = (double) td->sys_time * 100 / runt;
@@
-430,7
+429,7
@@
static void show_thread_status_terse(struct thread_data *td,
show_ddir_status_terse(td, rs, 1);
if (td->runtime[0] + td->runtime[1]) {
show_ddir_status_terse(td, rs, 1);
if (td->runtime[0] + td->runtime[1]) {
- double runt =
td->runtime[0] + td->runtime[1]
;
+ double runt =
(double) (td->runtime[0] + td->runtime[1])
;
usr_cpu = (double) td->usr_time * 100 / runt;
sys_cpu = (double) td->sys_time * 100 / runt;
usr_cpu = (double) td->usr_time * 100 / runt;
sys_cpu = (double) td->sys_time * 100 / runt;
@@
-543,7
+542,7
@@
static inline void add_stat_sample(struct io_stat *is, unsigned long val)
}
static void add_log_sample(struct thread_data *td, struct io_log *iolog,
}
static void add_log_sample(struct thread_data *td, struct io_log *iolog,
- unsigned long val,
int
ddir)
+ unsigned long val,
enum fio_ddir
ddir)
{
if (iolog->nr_samples == iolog->max_samples) {
int new_size = sizeof(struct io_sample) * iolog->max_samples*2;
{
if (iolog->nr_samples == iolog->max_samples) {
int new_size = sizeof(struct io_sample) * iolog->max_samples*2;
@@
-558,7
+557,8
@@
static void add_log_sample(struct thread_data *td, struct io_log *iolog,
iolog->nr_samples++;
}
iolog->nr_samples++;
}
-void add_clat_sample(struct thread_data *td, int ddir, unsigned long msec)
+void add_clat_sample(struct thread_data *td, enum fio_ddir ddir,
+ unsigned long msec)
{
add_stat_sample(&td->clat_stat[ddir], msec);
{
add_stat_sample(&td->clat_stat[ddir], msec);
@@
-566,7
+566,8
@@
void add_clat_sample(struct thread_data *td, int ddir, unsigned long msec)
add_log_sample(td, td->clat_log, msec, ddir);
}
add_log_sample(td, td->clat_log, msec, ddir);
}
-void add_slat_sample(struct thread_data *td, int ddir, unsigned long msec)
+void add_slat_sample(struct thread_data *td, enum fio_ddir ddir,
+ unsigned long msec)
{
add_stat_sample(&td->slat_stat[ddir], msec);
{
add_stat_sample(&td->slat_stat[ddir], msec);
@@
-574,9
+575,10
@@
void add_slat_sample(struct thread_data *td, int ddir, unsigned long msec)
add_log_sample(td, td->slat_log, msec, ddir);
}
add_log_sample(td, td->slat_log, msec, ddir);
}
-void add_bw_sample(struct thread_data *td, int ddir)
+void add_bw_sample(struct thread_data *td, enum fio_ddir ddir,
+ struct timeval *t)
{
{
- unsigned long spent = mtime_since
_now(&td->stat_sample_time[ddir]
);
+ unsigned long spent = mtime_since
(&td->stat_sample_time[ddir], t
);
unsigned long rate;
if (spent < td->bw_avg_time)
unsigned long rate;
if (spent < td->bw_avg_time)
@@
-588,7
+590,7
@@
void add_bw_sample(struct thread_data *td, int ddir)
if (td->bw_log)
add_log_sample(td, td->bw_log, rate, ddir);
if (td->bw_log)
add_log_sample(td, td->bw_log, rate, ddir);
-
gettimeofday
(&td->stat_sample_time[ddir], NULL);
+
fio_gettime
(&td->stat_sample_time[ddir], NULL);
td->stat_io_bytes[ddir] = td->this_io_bytes[ddir];
}
td->stat_io_bytes[ddir] = td->this_io_bytes[ddir];
}