Use API instead of raw variables to update error stats.

Signed-off-by: Michal Mielewczyk <michal.mielewczyk@intel.com>
This commit is contained in:
Michal Mielewczyk 2019-09-05 06:03:40 -04:00
parent 0d4f4d3294
commit b4c384eb2d
13 changed files with 18 additions and 24 deletions

View File

@ -61,7 +61,7 @@ static void _ocf_backfill_complete(struct ocf_request *req, int error)
req->data = NULL; req->data = NULL;
if (req->error) { 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); ocf_engine_invalidate(req);
} else { } else {
ocf_req_unlock(req); ocf_req_unlock(req);

View File

@ -16,17 +16,13 @@
static void _ocf_d2c_completion(struct ocf_request *req, int error) static void _ocf_d2c_completion(struct ocf_request *req, int error)
{ {
ocf_core_t core = req->core;
req->error = error; req->error = error;
OCF_DEBUG_RQ(req, "Completion"); OCF_DEBUG_RQ(req, "Completion");
if (req->error) { if (req->error) {
req->info.core_error = 1; req->info.core_error = 1;
if (req->rw == OCF_READ) ocf_core_stats_core_error_update(req->core, req->rw);
env_atomic_inc(&core->counters->core_errors.read);
else
env_atomic_inc(&core->counters->core_errors.write);
} }
/* Complete request */ /* Complete request */

View File

@ -43,7 +43,7 @@ static void _ocf_read_fast_complete(struct ocf_request *req, int error)
if (req->error) { if (req->error) {
OCF_DEBUG_RQ(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); ocf_engine_push_req_front_pt(req);
} else { } else {
ocf_req_unlock(req); ocf_req_unlock(req);

View File

@ -20,7 +20,7 @@ static void _ocf_invalidate_req(struct ocf_request *req, int error)
{ {
if (error) { if (error) {
req->error = 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)) if (env_atomic_dec_return(&req->req_remaining))

View File

@ -28,7 +28,7 @@ static void _ocf_read_pt_complete(struct ocf_request *req, int error)
if (req->error) { if (req->error) {
req->info.core_error = 1; 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 */ /* Complete request */

View File

@ -38,7 +38,7 @@ static void _ocf_read_generic_hit_complete(struct ocf_request *req, int error)
OCF_DEBUG_RQ(req, "HIT completion"); OCF_DEBUG_RQ(req, "HIT completion");
if (req->error) { 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); ocf_engine_push_req_front_pt(req);
} else { } else {
@ -77,7 +77,7 @@ static void _ocf_read_generic_miss_complete(struct ocf_request *req, int error)
req->complete(req, req->error); req->complete(req, req->error);
req->info.core_error = 1; 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); ctx_data_free(cache->owner, req->cp_data);
req->cp_data = NULL; req->cp_data = NULL;

View File

@ -24,7 +24,7 @@ static void _ocf_read_wa_complete(struct ocf_request *req, int error)
if (req->error) { if (req->error) {
req->info.core_error = 1; 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 */ /* Complete request */

View File

@ -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) static void _ocf_write_wb_complete(struct ocf_request *req, int error)
{ {
if (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; req->error |= error;
} }

View File

@ -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) static void _ocf_write_wi_io_flush_metadata(struct ocf_request *req, int error)
{ {
if (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; req->error |= error;
} }
@ -77,7 +77,7 @@ static void _ocf_write_wi_core_complete(struct ocf_request *req, int error)
if (error) { if (error) {
req->error = error; req->error = error;
req->info.core_error = 1; 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)) if (env_atomic_dec_return(&req->req_remaining))

View File

@ -21,7 +21,7 @@
static void ocf_read_wo_cache_complete(struct ocf_request *req, int error) static void ocf_read_wo_cache_complete(struct ocf_request *req, int error)
{ {
if (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; req->error |= error;
} }
@ -148,7 +148,7 @@ static void _ocf_read_wo_core_complete(struct ocf_request *req, int error)
if (error) { if (error) {
req->error |= error; req->error |= error;
req->info.core_error = 1; 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 /* if all mapped cachelines are clean, the data we've read from core

View File

@ -48,7 +48,7 @@ static void _ocf_write_wt_cache_complete(struct ocf_request *req, int error)
{ {
if (error) { if (error) {
req->error = req->error ?: 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) if (req->error)
inc_fallback_pt_error_counter(req->cache); 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) { if (error) {
req->error = error; req->error = error;
req->info.core_error = 1; 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); _ocf_write_wt_req_complete(req);

View File

@ -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) static void _ocf_zero_io_flush_metadata(struct ocf_request *req, int error)
{ {
if (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; req->error = error;
} }

View File

@ -465,8 +465,7 @@ static void _ocf_cleaner_core_io_cmpl(struct ocf_io *io, int error)
if (error) { if (error) {
map->invalid |= 1; map->invalid |= 1;
_ocf_cleaner_set_error(req); _ocf_cleaner_set_error(req);
env_atomic_inc(&req->cache->core[map->core_id].counters-> ocf_core_stats_core_error_update(req->core, OCF_WRITE);
core_errors.write);
} }
_ocf_cleaner_core_io_end(req); _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) { if (error) {
map->invalid |= 1; map->invalid |= 1;
_ocf_cleaner_set_error(req); _ocf_cleaner_set_error(req);
env_atomic_inc(&req->cache->core[map->core_id].counters-> ocf_core_stats_cache_error_update(req->core, OCF_READ);
cache_errors.read);
} }
_ocf_cleaner_cache_io_end(req); _ocf_cleaner_cache_io_end(req);