Skip to content

core: Replace visitor with simple iterator #956

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

Merged
robertbaldyga merged 1 commit into from
Apr 16, 2026
Merged

core: Replace visitor with simple iterator #956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 21 additions & 16 deletions inc/ocf_core.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,30 +178,35 @@ static inline void ocf_core_submit_discard(ocf_io_t io)
}

/**
* @brief Core visitor function type which is called back when iterating over
* cores.
* @brief Get first core of given cache
*
* @param[in] core Core which is currently iterated (visited)
* @param[in] cntx Visitor context
* @param[in] cache OCF cache instance
* @param[in] only_opened Get only opened core
*
* @retval 0 continue visiting cores
* @retval Non-zero stop iterating and return result
* @retval First core of the cache, or NULL if there are no matching cores
*/
typedef int (*ocf_core_visitor_t)(ocf_core_t core, void *cntx);
ocf_core_t ocf_core_get_first(ocf_cache_t cache, bool only_opened);

/**
* @brief Run visitor function for each core of given cache
* @brief Get next core of given cache
*
* @param[in] cache OCF cache instance
* @param[in] visitor Visitor function
* @param[in] cntx Visitor context
* @param[in] only_opened Visit only opened cores
* @param[in] core Current core
* @param[in] only_opened Get only opened core
*
* @retval 0 Success
* @retval Non-zero Fail
* @retval Next core of the cache, or NULL if there are no more matching cores
*/
ocf_core_t ocf_core_get_next(ocf_core_t core, bool only_opened);

/**
* @brief Iterate over all cores of given cache
*
* @param[out] _core Loop cursor of type ocf_core_t
* @param[in] _cache OCF cache instance
* @param[in] _only_opened Iterate over opened cores only
*/
int ocf_core_visit(ocf_cache_t cache, ocf_core_visitor_t visitor, void *cntx,
bool only_opened);
#define ocf_core_for_each(_core, _cache, _only_opened) \
for (_core = ocf_core_get_first(_cache, _only_opened); _core; \
_core = ocf_core_get_next(_core, _only_opened))

/**
* @brief Get info of given core object
Expand Down
21 changes: 9 additions & 12 deletions src/mngt/ocf_mngt_cache.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3270,21 +3270,13 @@ void ocf_mngt_cache_attach(ocf_cache_t cache,
_ocf_mngt_cache_attach(cache, cfg, _ocf_mngt_cache_attach_complete, cmpl, priv);
}

static int _ocf_mngt_cache_load_core_log(ocf_core_t core, void *cntx)
{
if (ocf_core_state_active == ocf_core_get_state(core))
ocf_core_log(core, log_info, "Successfully added\n");
else
ocf_core_log(core, log_warn, "Failed to initialize\n");

return 0;
}

static void _ocf_mngt_cache_load_log(ocf_cache_t cache)
{
ocf_cache_mode_t cache_mode = ocf_cache_get_mode(cache);
ocf_cleaning_t cleaning_type = cache->cleaner.policy;
ocf_promotion_t promotion_type = cache->conf_meta->promotion_policy_type;
ocf_core_t core;
ocf_core_id_t core_id;

ocf_cache_log(cache, log_info, "Successfully loaded\n");
ocf_cache_log(cache, log_info, "Cache mode : %s\n",
Expand All @@ -3293,8 +3285,13 @@ static void _ocf_mngt_cache_load_log(ocf_cache_t cache)
ocf_cleaning_get_name(cleaning_type));
ocf_cache_log(cache, log_info, "Promotion policy : %s\n",
ocf_promotion_policies[promotion_type].name);
ocf_core_visit(cache, _ocf_mngt_cache_load_core_log,
cache, false);

for_each_core(cache, core, core_id) {
if (ocf_core_state_active == ocf_core_get_state(core))
ocf_core_log(core, log_info, "Successfully added\n");
else
ocf_core_log(core, log_warn, "Failed to initialize\n");
}
}

static void _ocf_mngt_cache_load_complete(ocf_cache_t cache, void *priv1,
Expand Down
89 changes: 66 additions & 23 deletions src/mngt/ocf_mngt_core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1017,9 +1017,9 @@ int ocf_mngt_core_get_user_metadata(ocf_core_t core, void *data, size_t size)
OCF_CORE_USER_DATA_SIZE);
}

static int _cache_mngt_set_core_seq_cutoff_threshold(ocf_core_t core, void *cntx)
static int _cache_mngt_set_core_seq_cutoff_threshold(ocf_core_t core,
uint32_t threshold)
{
uint32_t threshold = *(uint32_t*) cntx;
uint32_t threshold_old = ocf_core_get_seq_cutoff_threshold(core);

if (threshold < OCF_SEQ_CUTOFF_MIN_THRESHOLD ||
Expand Down Expand Up @@ -1058,12 +1058,16 @@ int ocf_mngt_core_set_seq_cutoff_threshold(ocf_core_t core, uint32_t thresh)
if (!ocf_cache_is_device_attached(cache))
return -OCF_ERR_CACHE_DETACHED;

return _cache_mngt_set_core_seq_cutoff_threshold(core, &thresh);
return _cache_mngt_set_core_seq_cutoff_threshold(core, thresh);
}

int ocf_mngt_core_set_seq_cutoff_threshold_all(ocf_cache_t cache,
uint32_t thresh)
{
ocf_core_t core;
ocf_core_id_t core_id;
int result;

OCF_CHECK_NULL(cache);

if (ocf_cache_is_standby(cache))
Expand All @@ -1072,8 +1076,16 @@ int ocf_mngt_core_set_seq_cutoff_threshold_all(ocf_cache_t cache,
if (!ocf_cache_is_device_attached(cache))
return -OCF_ERR_CACHE_DETACHED;

return ocf_core_visit(cache, _cache_mngt_set_core_seq_cutoff_threshold,
&thresh, true);
for_each_core(cache, core, core_id) {
if (!core->opened)
continue;
result = _cache_mngt_set_core_seq_cutoff_threshold(core,
thresh);
if (result)
return result;
}

return 0;
}

int ocf_mngt_core_get_seq_cutoff_threshold(ocf_core_t core, uint32_t *thresh)
Expand Down Expand Up @@ -1107,9 +1119,9 @@ static const char *_cache_mngt_seq_cutoff_policy_get_name(
return _ocf_seq_cutoff_policy_names[policy];
}

static int _cache_mngt_set_core_seq_cutoff_policy(ocf_core_t core, void *cntx)
static int _cache_mngt_set_core_seq_cutoff_policy(ocf_core_t core,
ocf_seq_cutoff_policy policy)
{
ocf_seq_cutoff_policy policy = *(ocf_seq_cutoff_policy*) cntx;
uint32_t policy_old = ocf_core_get_seq_cutoff_policy(core);

if (policy_old == policy) {
Expand Down Expand Up @@ -1149,11 +1161,16 @@ int ocf_mngt_core_set_seq_cutoff_policy(ocf_core_t core,
if (!ocf_cache_is_device_attached(cache))
return -OCF_ERR_CACHE_DETACHED;

return _cache_mngt_set_core_seq_cutoff_policy(core, &policy);
return _cache_mngt_set_core_seq_cutoff_policy(core, policy);
}

int ocf_mngt_core_set_seq_cutoff_policy_all(ocf_cache_t cache,
ocf_seq_cutoff_policy policy)
{
ocf_core_t core;
ocf_core_id_t core_id;
int result;

OCF_CHECK_NULL(cache);

if (ocf_cache_is_standby(cache))
Expand All @@ -1162,8 +1179,15 @@ int ocf_mngt_core_set_seq_cutoff_policy_all(ocf_cache_t cache,
if (!ocf_cache_is_device_attached(cache))
return -OCF_ERR_CACHE_DETACHED;

return ocf_core_visit(cache, _cache_mngt_set_core_seq_cutoff_policy,
&policy, true);
for_each_core(cache, core, core_id) {
if (!core->opened)
continue;
result = _cache_mngt_set_core_seq_cutoff_policy(core, policy);
if (result)
return result;
}

return 0;
}

int ocf_mngt_core_get_seq_cutoff_policy(ocf_core_t core,
Expand All @@ -1184,9 +1208,8 @@ int ocf_mngt_core_get_seq_cutoff_policy(ocf_core_t core,
}

static int _cache_mngt_set_core_seq_detect_promo_count(ocf_core_t core,
void *cntx)
uint32_t count)
{
uint32_t count = *(uint32_t*) cntx;
uint32_t count_old = ocf_core_get_seq_detect_promotion_count(core);

if (count < OCF_SEQ_DETECT_MIN_PROMOTION_COUNT ||
Expand Down Expand Up @@ -1226,12 +1249,16 @@ int ocf_mngt_core_set_seq_detect_promotion_count(ocf_core_t core,
if (!ocf_cache_is_device_attached(cache))
return -OCF_ERR_CACHE_DETACHED;

return _cache_mngt_set_core_seq_detect_promo_count(core, &count);
return _cache_mngt_set_core_seq_detect_promo_count(core, count);
}

int ocf_mngt_core_set_seq_detect_promotion_count_all(ocf_cache_t cache,
uint32_t count)
{
ocf_core_t core;
ocf_core_id_t core_id;
int result;

OCF_CHECK_NULL(cache);

if (ocf_cache_is_standby(cache))
Expand All @@ -1240,9 +1267,16 @@ int ocf_mngt_core_set_seq_detect_promotion_count_all(ocf_cache_t cache,
if (!ocf_cache_is_device_attached(cache))
return -OCF_ERR_CACHE_DETACHED;

return ocf_core_visit(cache,
_cache_mngt_set_core_seq_detect_promo_count,
&count, true);
for_each_core(cache, core, core_id) {
if (!core->opened)
continue;
result = _cache_mngt_set_core_seq_detect_promo_count(core,
count);
if (result)
return result;
}

return 0;
}

int ocf_mngt_core_get_seq_detect_promotion_count(ocf_core_t core,
Expand All @@ -1263,9 +1297,8 @@ int ocf_mngt_core_get_seq_detect_promotion_count(ocf_core_t core,
}

static int _cache_mngt_set_core_seq_detect_promo_threshold(
ocf_core_t core, void *cntx)
ocf_core_t core, uint32_t threshold)
{
uint32_t threshold = *(uint32_t *) cntx;
uint32_t threshold_old =
ocf_core_get_seq_detect_promotion_threshold(core);

Expand Down Expand Up @@ -1307,13 +1340,16 @@ int ocf_mngt_core_set_seq_detect_promotion_threshold(ocf_core_t core,
if (!ocf_cache_is_device_attached(cache))
return -OCF_ERR_CACHE_DETACHED;

return _cache_mngt_set_core_seq_detect_promo_threshold(core,
&threshold);
return _cache_mngt_set_core_seq_detect_promo_threshold(core, threshold);
}

int ocf_mngt_core_set_seq_detect_promotion_threshold_all(ocf_cache_t cache,
uint32_t threshold)
{
ocf_core_t core;
ocf_core_id_t core_id;
int result;

OCF_CHECK_NULL(cache);

if (ocf_cache_is_standby(cache))
Expand All @@ -1322,9 +1358,16 @@ int ocf_mngt_core_set_seq_detect_promotion_threshold_all(ocf_cache_t cache,
if (!ocf_cache_is_device_attached(cache))
return -OCF_ERR_CACHE_DETACHED;

return ocf_core_visit(cache,
_cache_mngt_set_core_seq_detect_promo_threshold,
&threshold, true);
for_each_core(cache, core, core_id) {
if (!core->opened)
continue;
result = _cache_mngt_set_core_seq_detect_promo_threshold(core,
threshold);
if (result)
return result;
}

return 0;
}

int ocf_mngt_core_get_seq_detect_promotion_threshold(ocf_core_t core,
Expand Down
36 changes: 19 additions & 17 deletions src/ocf_core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,33 +120,35 @@ uint32_t ocf_core_get_seq_detect_promotion_threshold(ocf_core_t core)
&core->conf_meta->seq_detect_promotion_threshold);
}

int ocf_core_visit(ocf_cache_t cache, ocf_core_visitor_t visitor, void *cntx,
static ocf_core_t _ocf_core_get_next_from(ocf_cache_t cache, ocf_core_id_t id,
bool only_opened)
{
ocf_core_id_t id;
int result = 0;

OCF_CHECK_NULL(cache);

if (ocf_cache_is_standby(cache))
return -OCF_ERR_CACHE_STANDBY;

if (!visitor)
return -OCF_ERR_INVAL;

for (id = 0; id < OCF_CORE_NUM; id++) {
for (; id < OCF_CORE_NUM; id++) {
if (!env_bit_test(id, cache->conf_meta->valid_core_bitmap))
continue;

if (only_opened && !cache->core[id].opened)
continue;

result = visitor(&cache->core[id], cntx);
if (result)
break;
return &cache->core[id];
}

return result;
return NULL;
}

ocf_core_t ocf_core_get_first(ocf_cache_t cache, bool only_opened)
{
OCF_CHECK_NULL(cache);

return _ocf_core_get_next_from(cache, 0, only_opened);
}

ocf_core_t ocf_core_get_next(ocf_core_t core, bool only_opened)
{
OCF_CHECK_NULL(core);

return _ocf_core_get_next_from(ocf_core_get_cache(core),
ocf_core_get_id(core) + 1, only_opened);
}

/* *** HELPER FUNCTIONS *** */
Expand Down
Loading
Loading