Skip to content

Fix stats totals and struct zeroing #991

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rafalste wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix stats totals and struct zeroing #991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25f90f4
stats: Use cache and core totals for cleaner and prefetcher stats
rafalste Oct 26, 2026
2d1f9db
stats: Use memset instead of an aggregate initializer to zero a struct
rafalste Oct 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 34 additions & 34 deletions src/ocf_stats_builder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,36 +124,36 @@ static void _fill_req_part(struct ocf_stats_requests *req,
static void _fill_blocks(struct ocf_stats_blocks *blocks,
const struct ocf_stats_core *s)
{
uint64_t rd, wr, total;
uint64_t rd, wr, total, core_total, cache_total;
uint64_t pf_rd, pf_wr;
uint64_t cl_rd, cl_wr;
ocf_pf_id_t pf_id;

/* Core volume */
rd = _bytes4k(s->core_volume.read);
wr = _bytes4k(s->core_volume.write);
total = rd + wr;
core_total = rd + wr;

for_each_pf(pf_id)
total += _bytes4k(s->prefetch_blocks[pf_id].read);
total += _bytes4k(s->cleaner_blocks.write);
core_total += _bytes4k(s->prefetch_blocks[pf_id].read);
core_total += _bytes4k(s->cleaner_blocks.write);

_set(&blocks->core_volume_rd, rd, total);
_set(&blocks->core_volume_wr, wr, total);
_set(&blocks->core_volume_total, total, total);
_set(&blocks->core_volume_rd, rd, core_total);
_set(&blocks->core_volume_wr, wr, core_total);
_set(&blocks->core_volume_total, core_total, core_total);

/* Cache volume */
rd = _bytes4k(s->cache_volume.read);
wr = _bytes4k(s->cache_volume.write);
total = rd + wr;
cache_total = rd + wr;

for_each_pf(pf_id)
total += _bytes4k(s->prefetch_blocks[pf_id].write);
total += _bytes4k(s->cleaner_blocks.read);
cache_total += _bytes4k(s->prefetch_blocks[pf_id].write);
cache_total += _bytes4k(s->cleaner_blocks.read);

_set(&blocks->cache_volume_rd, rd, total);
_set(&blocks->cache_volume_wr, wr, total);
_set(&blocks->cache_volume_total, total, total);
_set(&blocks->cache_volume_rd, rd, cache_total);
_set(&blocks->cache_volume_wr, wr, cache_total);
_set(&blocks->cache_volume_total, cache_total, cache_total);

/* Core (cache volume) */
rd = _bytes4k(s->core.read);
Expand All @@ -174,53 +174,53 @@ static void _fill_blocks(struct ocf_stats_blocks *blocks,
/* Prefetch */
for_each_pf(pf_id) {
pf_rd = _bytes4k(s->prefetch_blocks[pf_id].read);
_set(&blocks->prefetch_core_rd[pf_id], pf_rd, total);
_set(&blocks->prefetch_core_rd[pf_id], pf_rd, core_total);
}
for_each_pf(pf_id) {
pf_wr = _bytes4k(s->prefetch_blocks[pf_id].write);
_set(&blocks->prefetch_cache_wr[pf_id], pf_wr, total);
_set(&blocks->prefetch_cache_wr[pf_id], pf_wr, cache_total);
}

/* Cleaner */
cl_rd = _bytes4k(s->cleaner_blocks.read);
_set(&blocks->cleaner_cache_rd, cl_rd, total);
_set(&blocks->cleaner_cache_rd, cl_rd, cache_total);
cl_wr = _bytes4k(s->cleaner_blocks.write);
_set(&blocks->cleaner_core_wr, cl_wr, total);
_set(&blocks->cleaner_core_wr, cl_wr, core_total);
}

static void _fill_blocks_part(struct ocf_stats_blocks *blocks,
const struct ocf_stats_io_class *s)
{
uint64_t rd, wr, total;
uint64_t rd, wr, total, core_total, cache_total;
uint64_t pf_rd, pf_wr;
uint64_t cl_rd, cl_wr;
ocf_pf_id_t pf_id;

/* Core volume */
rd = _bytes4k(s->core_blocks.read);
wr = _bytes4k(s->core_blocks.write);
total = rd + wr;
core_total = rd + wr;

for_each_pf(pf_id)
total += _bytes4k(s->prefetch_blocks[pf_id].read);
total += _bytes4k(s->cleaner_blocks.write);
core_total += _bytes4k(s->prefetch_blocks[pf_id].read);
core_total += _bytes4k(s->cleaner_blocks.write);

_set(&blocks->core_volume_rd, rd, total);
_set(&blocks->core_volume_wr, wr, total);
_set(&blocks->core_volume_total, total, total);
_set(&blocks->core_volume_rd, rd, core_total);
_set(&blocks->core_volume_wr, wr, core_total);
_set(&blocks->core_volume_total, core_total, core_total);

/* Cache volume */
rd = _bytes4k(s->cache_blocks.read);
wr = _bytes4k(s->cache_blocks.write);
total = rd + wr;
cache_total = rd + wr;

for_each_pf(pf_id)
total += _bytes4k(s->prefetch_blocks[pf_id].write);
total += _bytes4k(s->cleaner_blocks.read);
cache_total += _bytes4k(s->prefetch_blocks[pf_id].write);
cache_total += _bytes4k(s->cleaner_blocks.read);

_set(&blocks->cache_volume_rd, rd, total);
_set(&blocks->cache_volume_wr, wr, total);
_set(&blocks->cache_volume_total, total, total);
_set(&blocks->cache_volume_rd, rd, cache_total);
_set(&blocks->cache_volume_wr, wr, cache_total);
_set(&blocks->cache_volume_total, cache_total, cache_total);

/* Core (cache volume) */
rd = _bytes4k(s->blocks.read);
Expand All @@ -241,18 +241,18 @@ static void _fill_blocks_part(struct ocf_stats_blocks *blocks,
/* Prefetch */
for_each_pf(pf_id) {
pf_rd = _bytes4k(s->prefetch_blocks[pf_id].read);
_set(&blocks->prefetch_core_rd[pf_id], pf_rd, total);
_set(&blocks->prefetch_core_rd[pf_id], pf_rd, core_total);
}
for_each_pf(pf_id) {
pf_wr = _bytes4k(s->prefetch_blocks[pf_id].write);
_set(&blocks->prefetch_cache_wr[pf_id], pf_wr, total);
_set(&blocks->prefetch_cache_wr[pf_id], pf_wr, cache_total);
}

/* Cleaner */
cl_rd = _bytes4k(s->cleaner_blocks.read);
_set(&blocks->cleaner_cache_rd, cl_rd, total);
_set(&blocks->cleaner_cache_rd, cl_rd, cache_total);
cl_wr = _bytes4k(s->cleaner_blocks.write);
_set(&blocks->cleaner_core_wr, cl_wr, total);
_set(&blocks->cleaner_core_wr, cl_wr, core_total);
}

static void _fill_errors(struct ocf_stats_errors *errors,
Expand Down
6 changes: 2 additions & 4 deletions src/utils/utils_stats.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@

#define _ocf_stats_zero(stats) \
do { \
if (stats) { \
typeof(*stats) zero = { { 0 } }; \
*stats = zero; \
} \
if (stats) \

Check failure on line 11 in src/utils/utils_stats.h

View workflow job for this annotation

GitHub Actions / checkpatch review 

WARNING: suspect code indent for conditional statements (8, 12)

Check failure on line 11 in src/utils/utils_stats.h

View workflow job for this annotation

GitHub Actions / checkpatch review 

WARNING: please, no spaces at the start of a line

Check failure on line 11 in src/utils/utils_stats.h

View workflow job for this annotation

GitHub Actions / checkpatch review 

ERROR: code indent should use tabs where possible
ENV_BUG_ON(env_memset(stats, sizeof(*stats), 0)); \

Check failure on line 12 in src/utils/utils_stats.h

View workflow job for this annotation

GitHub Actions / checkpatch review 

WARNING: please, no spaces at the start of a line

Check failure on line 12 in src/utils/utils_stats.h

View workflow job for this annotation

GitHub Actions / checkpatch review 

ERROR: code indent should use tabs where possible
} while (0)

static inline uint64_t _fraction(uint64_t numerator, uint64_t denominator)
Expand Down
Loading