flist_del(&slave->slavelist);
slave->users--;
}
-
+
fio_mutex_remove(du->lock);
sfree(du);
}
!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?
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);
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)) {
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,
if (util > 100.0)
util = 100.0;
- if (agg->slavecount)
- log_info(" ");
-
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],
* 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");