casadm: Fix printing of ioclass stats

Signed-off-by: Robert Baldyga <robert.baldyga@intel.com>
This commit is contained in:
Robert Baldyga 2020-01-21 12:13:32 +01:00
parent 159df1fb3e
commit 4f51b9c1c0

View File

@ -430,7 +430,8 @@ void cache_stats_inactive_usage(int ctrl_fd, const struct kcas_cache_info *cache
* print statistics regarding single io class (partition) * print statistics regarding single io class (partition)
*/ */
void print_stats_ioclass(struct kcas_io_class *io_class, void print_stats_ioclass(struct kcas_io_class *io_class,
struct kcas_get_stats *stats, FILE *outfile, unsigned int stats_filters) struct kcas_get_stats *stats, bool cache_stats,
FILE *outfile, unsigned int stats_filters)
{ {
if (stats_filters & STATS_FILTER_CONF) if (stats_filters & STATS_FILTER_CONF)
print_stats_ioclass_conf(io_class, outfile); print_stats_ioclass_conf(io_class, outfile);
@ -442,7 +443,7 @@ void print_stats_ioclass(struct kcas_io_class *io_class,
print_req_stats(&stats->req, outfile); print_req_stats(&stats->req, outfile);
if (stats_filters & STATS_FILTER_BLK) if (stats_filters & STATS_FILTER_BLK)
print_blk_stats(&stats->blocks, true, outfile); print_blk_stats(&stats->blocks, cache_stats, outfile);
} }
/** /**
@ -457,6 +458,7 @@ int cache_stats_ioclasses(int ctrl_fd, const struct kcas_cache_info *cache_info,
struct kcas_io_class info = {}; struct kcas_io_class info = {};
struct kcas_get_stats stats = {}; struct kcas_get_stats stats = {};
int part_iter_id; int part_iter_id;
bool cache_stats = (core_id == OCF_CORE_ID_INVALID);
if (io_class_id != OCF_IO_CLASS_INVALID) { if (io_class_id != OCF_IO_CLASS_INVALID) {
info.cache_id = cache_id; info.cache_id = cache_id;
@ -473,7 +475,8 @@ int cache_stats_ioclasses(int ctrl_fd, const struct kcas_cache_info *cache_info,
begin_record(outfile); begin_record(outfile);
print_stats_ioclass(&info, &stats, outfile, stats_filters); print_stats_ioclass(&info, &stats, cache_stats,
outfile, stats_filters);
return SUCCESS; return SUCCESS;
} }
@ -498,7 +501,8 @@ int cache_stats_ioclasses(int ctrl_fd, const struct kcas_cache_info *cache_info,
begin_record(outfile); begin_record(outfile);
print_stats_ioclass(&info, &stats, outfile, stats_filters); print_stats_ioclass(&info, &stats, cache_stats,
outfile, stats_filters);
memset(&stats, 0, sizeof(stats)); memset(&stats, 0, sizeof(stats));
memset(&info, 0, sizeof(info)); memset(&info, 0, sizeof(info));