Skip to content

perf(cli): skip the forced info reads when the invocation performs an action #549

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
AdrianKuriata wants to merge 1 commit into
base: master
Choose a base branch
from
Open

perf(cli): skip the forced info reads when the invocation performs an action #549

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
18 changes: 17 additions & 1 deletion cli/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1031,10 +1031,26 @@ std::vector<DeviceList> toLegacyDeviceList(std::vector<DiscoveredDevice>& device
return legacy;
}

// Whether this invocation was asked to set something.
bool hasRequestedAction(const std::vector<DiscoveredDevice>& devices)
{
for (const auto& dev : devices) {
for (const auto& req : dev.feature_requests) {
if (req.type == CAPABILITYTYPE_ACTION && req.should_process) {
return true;
}
}
}

return false;
}

// Enable info requests for extended output formats (JSON, YAML, ENV)
// Only for a pure query: the extra reads can cost far more than the action
// itself (Maxwell 2: -s 20 is 0.07 s, -s 20 -o json is 2.90 s).
void enableExtendedInfoRequests(std::vector<DiscoveredDevice>& devices, bool extended)
{
if (!extended)
if (!extended || hasRequestedAction(devices))
return;

for (auto& dev : devices) {
Expand Down
Loading