From b4c384eb2d39b5b206697c4a43e64ed147fb768d Mon Sep 17 00:00:00 2001 From: Michal Mielewczyk Date: Thu, 5 Sep 2019 06:03:40 -0400 Subject: [PATCH] Use API instead of raw variables to update error stats. Signed-off-by: Michal Mielewczyk --- src/engine/engine_bf.c | 2 +- src/engine/engine_d2c.c | 6 +----- src/engine/engine_fast.c | 2 +- src/engine/engine_inv.c | 2 +- src/engine/engine_pt.c | 2 +- src/engine/engine_rd.c | 4 ++-- src/engine/engine_wa.c | 2 +- src/engine/engine_wb.c | 2 +- src/engine/engine_wi.c | 4 ++-- src/engine/engine_wo.c | 4 ++-- src/engine/engine_wt.c | 4 ++-- src/engine/engine_zero.c | 2 +- src/utils/utils_cleaner.c | 6 ++---- 13 files changed, 18 insertions(+), 24 deletions(-) diff --git a/src/engine/engine_bf.c b/src/engine/engine_bf.c index 865b793..5899feb 100644 --- a/src/engine/engine_bf.c +++ b/src/engine/engine_bf.c @@ -61,7 +61,7 @@ static void _ocf_backfill_complete(struct ocf_request *req, int error) req->data = NULL; if (req->error) { - env_atomic_inc(&req->core->counters->cache_errors.write); + ocf_core_stats_cache_error_update(req->core, OCF_WRITE); ocf_engine_invalidate(req); } else { ocf_req_unlock(req); diff --git a/src/engine/engine_d2c.c b/src/engine/engine_d2c.c index 337769d..d88a964 100644 --- a/src/engine/engine_d2c.c +++ b/src/engine/engine_d2c.c @@ -16,17 +16,13 @@ static void _ocf_d2c_completion(struct ocf_request *req, int error) { - ocf_core_t core = req->core; req->error = error; OCF_DEBUG_RQ(req, "Completion"); if (req->error) { req->info.core_error = 1; - if (req->rw == OCF_READ) - env_atomic_inc(&core->counters->core_errors.read); - else - env_atomic_inc(&core->counters->core_errors.write); + ocf_core_stats_core_error_update(req->core, req->rw); } /* Complete request */ diff --git a/src/engine/engine_fast.c b/src/engine/engine_fast.c index 3921104..e62593d 100644 --- a/src/engine/engine_fast.c +++ b/src/engine/engine_fast.c @@ -43,7 +43,7 @@ static void _ocf_read_fast_complete(struct ocf_request *req, int error) if (req->error) { OCF_DEBUG_RQ(req, "ERROR"); - env_atomic_inc(&req->core->counters->cache_errors.read); + ocf_core_stats_cache_error_update(req->core, OCF_READ); ocf_engine_push_req_front_pt(req); } else { ocf_req_unlock(req); diff --git a/src/engine/engine_inv.c b/src/engine/engine_inv.c index fd30204..347d3cf 100644 --- a/src/engine/engine_inv.c +++ b/src/engine/engine_inv.c @@ -20,7 +20,7 @@ static void _ocf_invalidate_req(struct ocf_request *req, int error) { if (error) { req->error = error; - env_atomic_inc(&req->core->counters->cache_errors.write); + ocf_core_stats_cache_error_update(req->core, OCF_WRITE); } if (env_atomic_dec_return(&req->req_remaining)) diff --git a/src/engine/engine_pt.c b/src/engine/engine_pt.c index 852b953..fd73609 100644 --- a/src/engine/engine_pt.c +++ b/src/engine/engine_pt.c @@ -28,7 +28,7 @@ static void _ocf_read_pt_complete(struct ocf_request *req, int error) if (req->error) { req->info.core_error = 1; - env_atomic_inc(&req->core->counters->core_errors.read); + ocf_core_stats_core_error_update(req->core, OCF_READ); } /* Complete request */ diff --git a/src/engine/engine_rd.c b/src/engine/engine_rd.c index 4d6794f..2ca2d48 100644 --- a/src/engine/engine_rd.c +++ b/src/engine/engine_rd.c @@ -38,7 +38,7 @@ static void _ocf_read_generic_hit_complete(struct ocf_request *req, int error) OCF_DEBUG_RQ(req, "HIT completion"); if (req->error) { - env_atomic_inc(&req->core->counters->cache_errors.read); + ocf_core_stats_cache_error_update(req->core, OCF_READ); ocf_engine_push_req_front_pt(req); } else { @@ -77,7 +77,7 @@ static void _ocf_read_generic_miss_complete(struct ocf_request *req, int error) req->complete(req, req->error); req->info.core_error = 1; - env_atomic_inc(&req->core->counters->core_errors.read); + ocf_core_stats_core_error_update(req->core, OCF_READ); ctx_data_free(cache->owner, req->cp_data); req->cp_data = NULL; diff --git a/src/engine/engine_wa.c b/src/engine/engine_wa.c index 5613445..c41fd8b 100644 --- a/src/engine/engine_wa.c +++ b/src/engine/engine_wa.c @@ -24,7 +24,7 @@ static void _ocf_read_wa_complete(struct ocf_request *req, int error) if (req->error) { req->info.core_error = 1; - env_atomic_inc(&req->core->counters->core_errors.write); + ocf_core_stats_core_error_update(req->core, OCF_WRITE); } /* Complete request */ diff --git a/src/engine/engine_wb.c b/src/engine/engine_wb.c index 73cafc1..223cabf 100644 --- a/src/engine/engine_wb.c +++ b/src/engine/engine_wb.c @@ -89,7 +89,7 @@ static const struct ocf_io_if _io_if_wb_flush_metadata = { static void _ocf_write_wb_complete(struct ocf_request *req, int error) { if (error) { - env_atomic_inc(&req->core->counters->cache_errors.write); + ocf_core_stats_cache_error_update(req->core, OCF_WRITE); req->error |= error; } diff --git a/src/engine/engine_wi.c b/src/engine/engine_wi.c index 1fdae6b..6e8c285 100644 --- a/src/engine/engine_wi.c +++ b/src/engine/engine_wi.c @@ -26,7 +26,7 @@ static const struct ocf_io_if _io_if_wi_flush_metadata = { static void _ocf_write_wi_io_flush_metadata(struct ocf_request *req, int error) { if (error) { - env_atomic_inc(&req->core->counters->cache_errors.write); + ocf_core_stats_cache_error_update(req->core, OCF_WRITE); req->error |= error; } @@ -77,7 +77,7 @@ static void _ocf_write_wi_core_complete(struct ocf_request *req, int error) if (error) { req->error = error; req->info.core_error = 1; - env_atomic_inc(&req->core->counters->core_errors.write); + ocf_core_stats_core_error_update(req->core, OCF_WRITE); } if (env_atomic_dec_return(&req->req_remaining)) diff --git a/src/engine/engine_wo.c b/src/engine/engine_wo.c index f4fba5f..022d70b 100644 --- a/src/engine/engine_wo.c +++ b/src/engine/engine_wo.c @@ -21,7 +21,7 @@ static void ocf_read_wo_cache_complete(struct ocf_request *req, int error) { if (error) { - env_atomic_inc(&req->core->counters->cache_errors.read); + ocf_core_stats_cache_error_update(req->core, OCF_READ); req->error |= error; } @@ -148,7 +148,7 @@ static void _ocf_read_wo_core_complete(struct ocf_request *req, int error) if (error) { req->error |= error; req->info.core_error = 1; - env_atomic_inc(&req->core->counters->core_errors.read); + ocf_core_stats_core_error_update(req->core, OCF_READ); } /* if all mapped cachelines are clean, the data we've read from core diff --git a/src/engine/engine_wt.c b/src/engine/engine_wt.c index 0d70cec..ac5fc41 100644 --- a/src/engine/engine_wt.c +++ b/src/engine/engine_wt.c @@ -48,7 +48,7 @@ static void _ocf_write_wt_cache_complete(struct ocf_request *req, int error) { if (error) { req->error = req->error ?: error; - env_atomic_inc(&req->core->counters->cache_errors.write); + ocf_core_stats_cache_error_update(req->core, OCF_WRITE); if (req->error) inc_fallback_pt_error_counter(req->cache); @@ -62,7 +62,7 @@ static void _ocf_write_wt_core_complete(struct ocf_request *req, int error) if (error) { req->error = error; req->info.core_error = 1; - env_atomic_inc(&req->core->counters->core_errors.write); + ocf_core_stats_core_error_update(req->core, OCF_WRITE); } _ocf_write_wt_req_complete(req); diff --git a/src/engine/engine_zero.c b/src/engine/engine_zero.c index f3d0439..7caa52f 100644 --- a/src/engine/engine_zero.c +++ b/src/engine/engine_zero.c @@ -50,7 +50,7 @@ static const struct ocf_io_if _io_if_zero_purge = { static void _ocf_zero_io_flush_metadata(struct ocf_request *req, int error) { if (error) { - env_atomic_inc(&req->core->counters->cache_errors.write); + ocf_core_stats_cache_error_update(req->core, OCF_WRITE); req->error = error; } diff --git a/src/utils/utils_cleaner.c b/src/utils/utils_cleaner.c index 2bd5635..eb139a3 100644 --- a/src/utils/utils_cleaner.c +++ b/src/utils/utils_cleaner.c @@ -465,8 +465,7 @@ static void _ocf_cleaner_core_io_cmpl(struct ocf_io *io, int error) if (error) { map->invalid |= 1; _ocf_cleaner_set_error(req); - env_atomic_inc(&req->cache->core[map->core_id].counters-> - core_errors.write); + ocf_core_stats_core_error_update(req->core, OCF_WRITE); } _ocf_cleaner_core_io_end(req); @@ -623,8 +622,7 @@ static void _ocf_cleaner_cache_io_cmpl(struct ocf_io *io, int error) if (error) { map->invalid |= 1; _ocf_cleaner_set_error(req); - env_atomic_inc(&req->cache->core[map->core_id].counters-> - cache_errors.read); + ocf_core_stats_cache_error_update(req->core, OCF_READ); } _ocf_cleaner_cache_io_end(req);