Skip to content

Performance tweaks #3468

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

Open
wants to merge 8 commits into
base: v3/master
Choose a base branch
from
Open

Performance tweaks #3468

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
907d7f8
Use reference in range-based for loop
edding3000 Nov 20, 2025
12671d1
Use explicit '*' with auto for pointers
edding3000 Nov 20, 2025
e9bf9ad
Add const modifier to range-based for loops
edding3000 Nov 21, 2025
e4f3feb
Use const pointers
edding3000 Nov 21, 2025
c7b2fdf
Use explicit '*' with auto for pointers in tests
edding3000 Nov 21, 2025
ef42d05
Remove c-cast from test
edding3000 Nov 21, 2025
72b46c5
Switch to const string reference as nothing is modified
edding3000 Nov 21, 2025
c9f2f35
Add const to parameter
edding3000 Nov 21, 2025
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
2 changes: 1 addition & 1 deletion src/engine/lua.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ int Lua::getvars(lua_State *L) {
variables::Variable::stringMatchResolveMulti(t, varname, &l);

lua_newtable(L);
for (auto i : l) {
for (auto* i : l) {
Copy link
Member

@airween airween Nov 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
for (auto* i : l) {
for (const auto* i : l) {

The original code was written about 8 years ago, the author is no longer involved in development.

If I had to guess why they used value copy mechanism, I would say they wanted to avoid any chance to modify the value on Lua stack (except for intentional change with setvar()).

If we want to keep this restriction, please consider to use const modifier here.

lua_pushnumber(L, idx);
lua_newtable(L);

Expand Down
4 changes: 2 additions & 2 deletions src/rules_exceptions.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ bool RulesExceptions::contains(int a) {
}
}

for (auto z : m_ranges) {
for (auto& z : m_ranges) {
Copy link
Member

@airween airween Nov 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
for (auto& z : m_ranges) {
for (const auto& z : m_ranges) {

Please see cppcheck's warning:

warning: src/rules_exceptions.cc,198,style,constVariableReference,Variable 'z' can be declared as reference to const

Copy link
Member

@airween airween Nov 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sonarcloud also reports this.

if (z.first <= a && z.second >= a) {
return true;
}
Expand All @@ -212,7 +212,7 @@ bool RulesExceptions::merge(RulesExceptions *from) {
return ret;
}
}
for (auto b : from->m_ranges) {
for (auto& b : from->m_ranges) {
Copy link
Member

@airween airween Nov 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
for (auto& b : from->m_ranges) {
for (const auto& b : from->m_ranges) {

Please see cppcheck's warning:

warning: src/rules_exceptions.cc,215,style,constVariableReference,Variable 'b' can be declared as reference to const

bool ret = addRange(b.first, b.second);
if (ret == false) {
return ret;
Expand Down
4 changes: 2 additions & 2 deletions src/transaction.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1700,7 +1700,7 @@ std::string Transaction::toJSON(int parts) {
reinterpret_cast<const unsigned char*>("messages"),
strlen("messages"));
yajl_gen_array_open(g);
for (auto a : m_rulesMessages) {
for (auto& a : m_rulesMessages) {
Copy link
Member

@airween airween Nov 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
for (auto& a : m_rulesMessages) {
for (const auto& a : m_rulesMessages) {

Probably here you could use const too.

yajl_gen_map_open(g);
LOGFY_ADD("message", a.m_message);
yajl_gen_string(g,
Expand All @@ -1721,7 +1721,7 @@ std::string Transaction::toJSON(int parts) {
reinterpret_cast<const unsigned char*>("tags"),
strlen("tags"));
yajl_gen_array_open(g);
for (auto b : a.m_tags) {
for (auto& b : a.m_tags) {
Copy link
Member

@airween airween Nov 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
for (auto& b : a.m_tags) {
for (const auto& b : a.m_tags) {

Probably here you could use const too.

yajl_gen_string(g,
reinterpret_cast<const unsigned char*>(b.data()),
b.length());
Expand Down
Loading