Skip to content

Commit 7ea13fc

Browse files
authored
[ZmqOrch] Optimize memory by popping batch size at a time (#3910)
* [ZmqOrch] Optimize memory by popping batch size at a time What I did Used a reference instead of a unnecessary copy of a set object Optimize memory by popping batch size at a time NOTE: Please merge only after the below two PR's are merged sonic-net/sonic-swss-common#1084 sonic-net/sonic-sairedis#1660
1 parent 48650dc commit 7ea13fc

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

orchagent/dash/dashvnetorch.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ void DashVnetOrch::addPaValidation(const string& key, VnetMapBulkContext& ctxt)
438438
string underlay_ip_str = to_string(ctxt.metadata.underlay_ip());
439439
string pa_ref_key = ctxt.vnet_name + ":" + underlay_ip_str;
440440

441-
auto vnet_underlay_ips = vnet_table_[ctxt.vnet_name].underlay_ips;
441+
auto& vnet_underlay_ips = vnet_table_[ctxt.vnet_name].underlay_ips;
442442
std::string underlay_sip_str = to_string(ctxt.metadata.underlay_ip());
443443
if (vnet_underlay_ips.find(underlay_sip_str) != vnet_underlay_ips.end())
444444
{

orchagent/zmqorch.cpp

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,11 @@ void ZmqConsumer::execute()
99
{
1010
SWSS_LOG_ENTER();
1111

12-
size_t update_size = 0;
1312
auto table = static_cast<swss::ZmqConsumerStateTable*>(getSelectable());
14-
do
15-
{
16-
std::deque<KeyOpFieldsValuesTuple> entries;
17-
table->pops(entries);
18-
update_size = addToSync(entries);
19-
} while (update_size != 0);
13+
14+
std::deque<KeyOpFieldsValuesTuple> entries;
15+
table->pops(entries);
16+
addToSync(entries);
2017

2118
drain();
2219
}

0 commit comments

Comments
 (0)