From 865d11891d52326f81b5d0d65c2af2e3d9eff3f3 Mon Sep 17 00:00:00 2001 From: Stephen Sun Date: Sun, 10 Nov 2024 23:38:23 +0000 Subject: [PATCH] Rename Signed-off-by: Stephen Sun --- orchagent/flexcounterorch.cpp | 4 ++-- orchagent/saihelper.cpp | 12 ++++++------ orchagent/saihelper.h | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/orchagent/flexcounterorch.cpp b/orchagent/flexcounterorch.cpp index 6ffaac3e4c..800dbcad3e 100644 --- a/orchagent/flexcounterorch.cpp +++ b/orchagent/flexcounterorch.cpp @@ -243,9 +243,9 @@ void FlexCounterOrch::doTask(Consumer &consumer) // If it is exist and the value is 'true' we need to skip the iteration in order to delay the counter creation. // The field will clear out and counter will be created when enable_counters script is called. } - else if (field == BULK_SIZE_FIELD) + else if (field == BULK_CHUNK_SIZE_FIELD) { - setFlexCounterGroupBulkSize(flexCounterGroupMap[key], value, false); + setFlexCounterGroupBulkChunkSize(flexCounterGroupMap[key], value, false); } else { diff --git a/orchagent/saihelper.cpp b/orchagent/saihelper.cpp index 770f759633..0aa84b98b1 100644 --- a/orchagent/saihelper.cpp +++ b/orchagent/saihelper.cpp @@ -849,7 +849,7 @@ static inline void initSaiRedisCounterEmptyParameter(sai_redis_flex_counter_grou initSaiRedisCounterEmptyParameter(flex_counter_group_param.stats_mode); initSaiRedisCounterEmptyParameter(flex_counter_group_param.plugin_name); initSaiRedisCounterEmptyParameter(flex_counter_group_param.plugins); - initSaiRedisCounterEmptyParameter(flex_counter_group_param.bulk_size); + initSaiRedisCounterEmptyParameter(flex_counter_group_param.bulk_chunk_size); } static inline void initSaiRedisCounterParameterFromString(sai_s8_list_t &sai_s8_list, const std::string &str) @@ -934,7 +934,7 @@ void setFlexCounterGroupParameter(const string &group, attr.id = SAI_REDIS_SWITCH_ATTR_FLEX_COUNTER_GROUP; attr.value.ptr = &flex_counter_group_param; - initSaiRedisCounterEmptyParameter(flex_counter_group_param.bulk_size); + initSaiRedisCounterEmptyParameter(flex_counter_group_param.bulk_chunk_size); initSaiRedisCounterParameterFromString(flex_counter_group_param.counter_group_name, group); initSaiRedisCounterParameterFromString(flex_counter_group_param.poll_interval, poll_interval); initSaiRedisCounterParameterFromString(flex_counter_group_param.operation, operation); @@ -1014,9 +1014,9 @@ void setFlexCounterGroupStatsMode(const std::string &group, notifySyncdCounterOperation(is_gearbox, attr); } -void setFlexCounterGroupBulkSize(const std::string &group, - const std::string &bulk_size, - bool is_gearbox) +void setFlexCounterGroupBulkChunkSize(const std::string &group, + const std::string &bulk_chunk_size, + bool is_gearbox) { sai_attribute_t attr; sai_redis_flex_counter_group_parameter_t flex_counter_group_param; @@ -1026,7 +1026,7 @@ void setFlexCounterGroupBulkSize(const std::string &group, initSaiRedisCounterEmptyParameter(flex_counter_group_param); initSaiRedisCounterParameterFromString(flex_counter_group_param.counter_group_name, group); - initSaiRedisCounterParameterFromString(flex_counter_group_param.bulk_size, bulk_size); + initSaiRedisCounterParameterFromString(flex_counter_group_param.bulk_chunk_size, bulk_chunk_size); notifySyncdCounterOperation(is_gearbox, attr); } diff --git a/orchagent/saihelper.h b/orchagent/saihelper.h index f5fdfb8dfa..f3e2675d44 100644 --- a/orchagent/saihelper.h +++ b/orchagent/saihelper.h @@ -39,9 +39,9 @@ void setFlexCounterGroupStatsMode(const std::string &group, const std::string &stats_mode, bool is_gearbox=false); -void setFlexCounterGroupBulkSize(const std::string &group, - const std::string &bulk_size, - bool is_gearbox); +void setFlexCounterGroupBulkChunkSize(const std::string &group, + const std::string &bulk_size, + bool is_gearbox); void delFlexCounterGroup(const std::string &group, bool is_gearbox=false);