projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New offset_increment option
[fio.git]
/
diskutil.c
diff --git
a/diskutil.c
b/diskutil.c
index 3168b59d3b73dbf9e92d6d75963c49e7fa1f20e2..feb88526bbb90af4d67fbcec8b038c2305328ec2 100644
(file)
--- a/
diskutil.c
+++ b/
diskutil.c
@@
-31,7
+31,7
@@
static void disk_util_free(struct disk_util *du)
flist_del(&slave->slavelist);
slave->users--;
}
flist_del(&slave->slavelist);
slave->users--;
}
-
+
fio_mutex_remove(du->lock);
sfree(du);
}
fio_mutex_remove(du->lock);
sfree(du);
}
@@
-215,7
+215,7
@@
static void find_add_disk_slaves(struct thread_data *td, char *path,
!strcmp(dirent->d_name, ".."))
continue;
!strcmp(dirent->d_name, ".."))
continue;
- sprintf(temppath, "%s
/%s", slavesdir
, dirent->d_name);
+ sprintf(temppath, "%s
%s%s", slavesdir, FIO_OS_PATH_SEPARATOR
, dirent->d_name);
/* Can we always assume that the slaves device entries
* are links to the real directories for the slave
* devices?
/* Can we always assume that the slaves device entries
* are links to the real directories for the slave
* devices?
@@
-240,7
+240,7
@@
static void find_add_disk_slaves(struct thread_data *td, char *path,
if (slavedu)
continue;
if (slavedu)
continue;
- sprintf(temppath, "%s
/%s", slavesdir
, slavepath);
+ sprintf(temppath, "%s
%s%s", slavesdir, FIO_OS_PATH_SEPARATOR
, slavepath);
__init_per_file_disk_util(td, majdev, mindev, temppath);
slavedu = disk_util_exists(majdev, mindev);
__init_per_file_disk_util(td, majdev, mindev, temppath);
slavedu = disk_util_exists(majdev, mindev);
@@
-327,7
+327,7
@@
static int find_block_dir(int majdev, int mindev, char *path, int link_ok)
if (!strcmp(dir->d_name, ".") || !strcmp(dir->d_name, ".."))
continue;
if (!strcmp(dir->d_name, ".") || !strcmp(dir->d_name, ".."))
continue;
- sprintf(full_path, "%s
/%s", path
, dir->d_name);
+ sprintf(full_path, "%s
%s%s", path, FIO_OS_PATH_SEPARATOR
, dir->d_name);
if (!strcmp(dir->d_name, "dev")) {
if (!check_dev_match(majdev, mindev, full_path)) {
if (!strcmp(dir->d_name, "dev")) {
if (!check_dev_match(majdev, mindev, full_path)) {
@@
-470,7
+470,7
@@
static void show_agg_stats(struct disk_util_agg *agg, int terse)
agg->time_in_queue / agg->slavecount,
agg->max_util.u.f);
} else {
agg->time_in_queue / agg->slavecount,
agg->max_util.u.f);
} else {
- log_info("slaves;%u;%u;%u;%u;%u;%u;%u;%3.2f%%",
+ log_info("
;
slaves;%u;%u;%u;%u;%u;%u;%u;%3.2f%%",
agg->ios[0] / agg->slavecount,
agg->ios[1] / agg->slavecount,
agg->merges[0] / agg->slavecount,
agg->ios[0] / agg->slavecount,
agg->ios[1] / agg->slavecount,
agg->merges[0] / agg->slavecount,
@@
-533,16
+533,17
@@
void free_disk_util(void)
void print_disk_util(struct disk_util_stat *dus, struct disk_util_agg *agg,
int terse)
{
void print_disk_util(struct disk_util_stat *dus, struct disk_util_agg *agg,
int terse)
{
- double util;
+ double util
= 0
;
- util = (double) 100 * dus->io_ticks / (double) dus->msec;
+ if (dus->msec)
+ util = (double) 100 * dus->io_ticks / (double) dus->msec;
if (util > 100.0)
util = 100.0;
if (util > 100.0)
util = 100.0;
- if (agg->slavecount)
- log_info(" ");
-
if (!terse) {
if (!terse) {
+ if (agg->slavecount)
+ log_info(" ");
+
log_info(" %s: ios=%u/%u, merge=%u/%u, ticks=%u/%u, "
"in_queue=%u, util=%3.2f%%", dus->name,
dus->ios[0], dus->ios[1],
log_info(" %s: ios=%u/%u, merge=%u/%u, ticks=%u/%u, "
"in_queue=%u, util=%3.2f%%", dus->name,
dus->ios[0], dus->ios[1],
@@
-561,8
+562,7
@@
void print_disk_util(struct disk_util_stat *dus, struct disk_util_agg *agg,
* If the device has slaves, aggregate the stats for
* those slave devices also.
*/
* If the device has slaves, aggregate the stats for
* those slave devices also.
*/
- if (agg->slavecount)
- show_agg_stats(agg, terse);
+ show_agg_stats(agg, terse);
if (!terse)
log_info("\n");
if (!terse)
log_info("\n");