clang-format: re-format for clang-18
clang-format-18 isn't compatible with the clang-format-17 output, so we
need to reformat the code with the latest version. The way clang-18
handles lambda formatting also changed, so we have made changes to the
organization default style format to better handle lambda formatting.
See I5e08687e696dd240402a2780158664b7113def0e for updated style.
See Iea0776aaa7edd483fa395e23de25ebf5a6288f71 for clang-18 enablement.
Change-Id: Ica590f8613f1fb89ab1ca676ac51c1cc7e38d67f
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/control/json/actions/action.hpp b/control/json/actions/action.hpp
index 0377a8a..93cd9e2 100644
--- a/control/json/actions/action.hpp
+++ b/control/json/actions/action.hpp
@@ -153,10 +153,11 @@
*/
virtual void addZone(Zone& zone)
{
- auto itZone = std::find_if(_zones.begin(), _zones.end(),
- [&zone](std::reference_wrapper<Zone>& z) {
- return z.get().getName() == zone.getName();
- });
+ auto itZone =
+ std::find_if(_zones.begin(), _zones.end(),
+ [&zone](std::reference_wrapper<Zone>& z) {
+ return z.get().getName() == zone.getName();
+ });
if (itZone == _zones.end())
{
_zones.emplace_back(std::reference_wrapper<Zone>(zone));
@@ -223,8 +224,8 @@
json groups = json::array();
std::for_each(_groups.begin(), _groups.end(),
[&groups](const auto& group) {
- groups.push_back(group.getName());
- });
+ groups.push_back(group.getName());
+ });
json output;
output["groups"] = groups;
return output;
@@ -331,11 +332,11 @@
else
{
// Construct list of available actions
- auto acts = std::accumulate(std::next(actions.begin()),
- actions.end(), actions.begin()->first,
- [](auto list, auto act) {
- return std::move(list) + ", " + act.first;
- });
+ auto acts = std::accumulate(
+ std::next(actions.begin()), actions.end(),
+ actions.begin()->first, [](auto list, auto act) {
+ return std::move(list) + ", " + act.first;
+ });
log<level::ERR>(
std::format("Action '{}' is not registered", name).c_str(),
entry("AVAILABLE_ACTIONS=%s", acts.c_str()));
diff --git a/control/json/actions/count_state_floor.cpp b/control/json/actions/count_state_floor.cpp
index 25cb3e6..a285a90 100644
--- a/control/json/actions/count_state_floor.cpp
+++ b/control/json/actions/count_state_floor.cpp
@@ -71,10 +71,10 @@
if (!_timer)
{
- _timer = std::make_unique<Timer>(util::SDEventPlus::getEvent(),
- [&zone, this](Timer&) {
- zone.setFloorHold(getUniqueName(), _floor, doCount());
- });
+ _timer = std::make_unique<Timer>(
+ util::SDEventPlus::getEvent(), [&zone, this](Timer&) {
+ zone.setFloorHold(getUniqueName(), _floor, doCount());
+ });
}
if (!_timer->isEnabled())
diff --git a/control/json/actions/default_floor.cpp b/control/json/actions/default_floor.cpp
index 95a2219..5ca3c10 100644
--- a/control/json/actions/default_floor.cpp
+++ b/control/json/actions/default_floor.cpp
@@ -43,8 +43,8 @@
auto isMissingOwner =
std::any_of(members.begin(), members.end(),
[&intf = group.getInterface()](const auto& member) {
- return !Manager::hasOwner(member, intf);
- });
+ return !Manager::hasOwner(member, intf);
+ });
if (isMissingOwner)
{
zone.setFloor(zone.getDefaultFloor());
diff --git a/control/json/actions/get_managed_objects.cpp b/control/json/actions/get_managed_objects.cpp
index 099a68b..eb5600e 100644
--- a/control/json/actions/get_managed_objects.cpp
+++ b/control/json/actions/get_managed_objects.cpp
@@ -60,11 +60,11 @@
}
// Look for the ObjectManager as an ancestor of the path.
- auto hasObjMgr = std::any_of(objMgrPaths.begin(),
- objMgrPaths.end(),
- [member](const auto& path) {
- return member.find(path) != std::string::npos;
- });
+ auto hasObjMgr = std::any_of(
+ objMgrPaths.begin(), objMgrPaths.end(),
+ [member](const auto& path) {
+ return member.find(path) != std::string::npos;
+ });
if (!hasObjMgr || services.find(service) == services.end())
{
@@ -99,8 +99,8 @@
// Add zone to _actions
std::for_each(_actions.begin(), _actions.end(),
[&zone](std::unique_ptr<ActionBase>& action) {
- action->addZone(zone);
- });
+ action->addZone(zone);
+ });
}
}
diff --git a/control/json/actions/mapped_floor.cpp b/control/json/actions/mapped_floor.cpp
index 3de2188..ab50075 100644
--- a/control/json/actions/mapped_floor.cpp
+++ b/control/json/actions/mapped_floor.cpp
@@ -232,12 +232,13 @@
{
std::visit(
[&value](auto&& val) {
- using V = std::decay_t<decltype(val)>;
- if constexpr (std::is_same_v<int32_t, V> || std::is_same_v<int64_t, V>)
- {
- value = static_cast<double>(val);
- }
- },
+ using V = std::decay_t<decltype(val)>;
+ if constexpr (std::is_same_v<int32_t, V> ||
+ std::is_same_v<int64_t, V>)
+ {
+ value = static_cast<double>(val);
+ }
+ },
value);
}
@@ -261,17 +262,17 @@
{
std::visit(
[&group, this](auto&& val) {
- using V = std::decay_t<decltype(val)>;
- if constexpr (!std::is_same_v<double, V> &&
- !std::is_same_v<int32_t, V> &&
- !std::is_same_v<int64_t, V>)
- {
- throw std::runtime_error{std::format(
- "{}: Group {} has more than one member but "
- "isn't numeric",
- ActionBase::getName(), group.getName())};
- }
- },
+ using V = std::decay_t<decltype(val)>;
+ if constexpr (!std::is_same_v<double, V> &&
+ !std::is_same_v<int32_t, V> &&
+ !std::is_same_v<int64_t, V>)
+ {
+ throw std::runtime_error{std::format(
+ "{}: Group {} has more than one member but "
+ "isn't numeric",
+ ActionBase::getName(), group.getName())};
+ }
+ },
value);
checked = true;
}
diff --git a/control/json/actions/missing_owner_target.cpp b/control/json/actions/missing_owner_target.cpp
index deed3cb..40894be 100644
--- a/control/json/actions/missing_owner_target.cpp
+++ b/control/json/actions/missing_owner_target.cpp
@@ -46,8 +46,8 @@
auto isMissingOwner =
std::any_of(members.begin(), members.end(),
[&intf = group.getInterface()](const auto& member) {
- return !Manager::hasOwner(member, intf);
- });
+ return !Manager::hasOwner(member, intf);
+ });
// Update zone's target hold based on action results
zone.setTargetHold(group.getName(), _target, isMissingOwner);
}
diff --git a/control/json/actions/net_target_increase.cpp b/control/json/actions/net_target_increase.cpp
index 7341a35..9c712a7 100644
--- a/control/json/actions/net_target_increase.cpp
+++ b/control/json/actions/net_target_increase.cpp
@@ -57,77 +57,80 @@
for (const auto& group : _groups)
{
const auto& members = group.getMembers();
- std::for_each(members.begin(), members.end(),
- [this, &zone, &group, &netDelta](const auto& member) {
- try
- {
- auto value = Manager::getObjValueVariant(
- member, group.getInterface(), group.getProperty());
- if (std::holds_alternative<int64_t>(value) ||
- std::holds_alternative<double>(value))
+ std::for_each(
+ members.begin(), members.end(),
+ [this, &zone, &group, &netDelta](const auto& member) {
+ try
{
- // Where a group of int/doubles are greater than or
- // equal to the state(some value) provided, request an
- // increase of the configured delta times the difference
- // between the group member's value and configured state
- // value.
- if (value >= _state)
+ auto value = Manager::getObjValueVariant(
+ member, group.getInterface(), group.getProperty());
+ if (std::holds_alternative<int64_t>(value) ||
+ std::holds_alternative<double>(value))
{
- uint64_t incDelta = 0;
- if (auto dblPtr = std::get_if<double>(&value))
+ // Where a group of int/doubles are greater than or
+ // equal to the state(some value) provided, request an
+ // increase of the configured delta times the difference
+ // between the group member's value and configured state
+ // value.
+ if (value >= _state)
{
- incDelta = static_cast<uint64_t>(
- (*dblPtr - std::get<double>(_state)) * _delta);
+ uint64_t incDelta = 0;
+ if (auto dblPtr = std::get_if<double>(&value))
+ {
+ incDelta = static_cast<uint64_t>(
+ (*dblPtr - std::get<double>(_state)) *
+ _delta);
+ }
+ else
+ {
+ // Increase by at least a single delta
+ // to attempt bringing under provided 'state'
+ auto deltaFactor =
+ std::max((std::get<int64_t>(value) -
+ std::get<int64_t>(_state)),
+ int64_t(1));
+ incDelta =
+ static_cast<uint64_t>(deltaFactor * _delta);
+ }
+ netDelta = std::max(netDelta, incDelta);
}
- else
+ }
+ else if (std::holds_alternative<bool>(value))
+ {
+ // Where a group of booleans equal the state(`true` or
+ // `false`) provided, request an increase of the
+ // configured delta
+ if (_state == value)
{
- // Increase by at least a single delta
- // to attempt bringing under provided 'state'
- auto deltaFactor =
- std::max((std::get<int64_t>(value) -
- std::get<int64_t>(_state)),
- int64_t(1));
- incDelta =
- static_cast<uint64_t>(deltaFactor * _delta);
+ netDelta = std::max(netDelta, _delta);
}
- netDelta = std::max(netDelta, incDelta);
}
- }
- else if (std::holds_alternative<bool>(value))
- {
- // Where a group of booleans equal the state(`true` or
- // `false`) provided, request an increase of the
- // configured delta
- if (_state == value)
+ else if (std::holds_alternative<std::string>(value))
{
- netDelta = std::max(netDelta, _delta);
+ // Where a group of strings equal the state(some string)
+ // provided, request an increase of the configured delta
+ if (_state == value)
+ {
+ netDelta = std::max(netDelta, _delta);
+ }
}
- }
- else if (std::holds_alternative<std::string>(value))
- {
- // Where a group of strings equal the state(some string)
- // provided, request an increase of the configured delta
- if (_state == value)
+ else
{
- netDelta = std::max(netDelta, _delta);
+ // Unsupported group member type for this action
+ log<level::ERR>(
+ std::format(
+ "Action {}: Unsupported group member type "
+ "given. [object = {} : {} : {}]",
+ ActionBase::getName(), member,
+ group.getInterface(), group.getProperty())
+ .c_str());
}
}
- else
+ catch (const std::out_of_range& oore)
{
- // Unsupported group member type for this action
- log<level::ERR>(
- std::format("Action {}: Unsupported group member type "
- "given. [object = {} : {} : {}]",
- ActionBase::getName(), member,
- group.getInterface(), group.getProperty())
- .c_str());
+ // Property value not found, netDelta unchanged
}
- }
- catch (const std::out_of_range& oore)
- {
- // Property value not found, netDelta unchanged
- }
- });
+ });
}
// Request increase to target
zone.requestIncrease(netDelta);
diff --git a/control/json/actions/override_fan_target.cpp b/control/json/actions/override_fan_target.cpp
index 103008a..33fbd34 100644
--- a/control/json/actions/override_fan_target.cpp
+++ b/control/json/actions/override_fan_target.cpp
@@ -87,8 +87,8 @@
{
fanList = std::accumulate(std::next(_fans.begin()), _fans.end(),
_fans[0], [](auto list, auto fan) {
- return std::move(list) + ", " + fan;
- });
+ return std::move(list) + ", " + fan;
+ });
}
record(std::format("Adding fan target lock of {} on fans [{}] zone {}",
diff --git a/control/json/actions/pcie_card_floors.cpp b/control/json/actions/pcie_card_floors.cpp
index 106d42f..a5cfee5 100644
--- a/control/json/actions/pcie_card_floors.cpp
+++ b/control/json/actions/pcie_card_floors.cpp
@@ -221,8 +221,8 @@
auto deviceID = getPCIeDeviceProperty(card, deviceIDProp);
auto vendorID = getPCIeDeviceProperty(card, vendorIDProp);
auto subsystemID = getPCIeDeviceProperty(card, subsystemIDProp);
- auto subsystemVendorID = getPCIeDeviceProperty(card,
- subsystemVendorIDProp);
+ auto subsystemVendorID =
+ getPCIeDeviceProperty(card, subsystemVendorIDProp);
return _cardMetadata->lookup(deviceID, vendorID, subsystemID,
subsystemVendorID);
@@ -251,10 +251,10 @@
// Find the card that plugs in this slot based on if the
// slot is part of the path, like slotA/cardA
- auto it = std::find_if(_pcieDevices.begin(), _pcieDevices.end(),
- [slotPath](const auto& path) {
- return path.find(slotPath + '/') != std::string::npos;
- });
+ auto it = std::find_if(
+ _pcieDevices.begin(), _pcieDevices.end(), [slotPath](const auto& path) {
+ return path.find(slotPath + '/') != std::string::npos;
+ });
if (it == _pcieDevices.end())
{
diff --git a/control/json/actions/set_parameter_from_group_max.cpp b/control/json/actions/set_parameter_from_group_max.cpp
index 99e184f..811f37c 100644
--- a/control/json/actions/set_parameter_from_group_max.cpp
+++ b/control/json/actions/set_parameter_from_group_max.cpp
@@ -64,20 +64,20 @@
bool invalid = false;
std::visit(
[&group, &invalid, this](auto&& val) {
- using V = std::decay_t<decltype(val)>;
- if constexpr (!std::is_same_v<double, V> &&
- !std::is_same_v<int32_t, V> &&
- !std::is_same_v<int64_t, V>)
- {
- log<level::ERR>(std::format("{}: Group {} has more "
- "than one member but "
- "isn't numeric",
- ActionBase::getName(),
- group.getName())
- .c_str());
- invalid = true;
- }
- },
+ using V = std::decay_t<decltype(val)>;
+ if constexpr (!std::is_same_v<double, V> &&
+ !std::is_same_v<int32_t, V> &&
+ !std::is_same_v<int64_t, V>)
+ {
+ log<level::ERR>(std::format("{}: Group {} has more "
+ "than one member but "
+ "isn't numeric",
+ ActionBase::getName(),
+ group.getName())
+ .c_str());
+ invalid = true;
+ }
+ },
value);
if (invalid)
{
diff --git a/control/json/actions/target_from_group_max.cpp b/control/json/actions/target_from_group_max.cpp
index 45216bb..d92457d 100644
--- a/control/json/actions/target_from_group_max.cpp
+++ b/control/json/actions/target_from_group_max.cpp
@@ -185,19 +185,19 @@
// considered numeric here.
std::visit(
[&group, &invalid, this](auto&& val) {
- using V = std::decay_t<decltype(val)>;
- if constexpr (!std::is_same_v<double, V> &&
- !std::is_same_v<int32_t, V> &&
- !std::is_same_v<int64_t, V>)
- {
- log<level::ERR>(std::format("{}: Group {}'s member "
- "isn't numeric",
- ActionBase::getName(),
- group.getName())
- .c_str());
- invalid = true;
- }
- },
+ using V = std::decay_t<decltype(val)>;
+ if constexpr (!std::is_same_v<double, V> &&
+ !std::is_same_v<int32_t, V> &&
+ !std::is_same_v<int64_t, V>)
+ {
+ log<level::ERR>(
+ std::format("{}: Group {}'s member "
+ "isn't numeric",
+ ActionBase::getName(), group.getName())
+ .c_str());
+ invalid = true;
+ }
+ },
value);
if (invalid)
{
diff --git a/control/json/actions/timer_based_actions.cpp b/control/json/actions/timer_based_actions.cpp
index 02779bd..21dbc29 100644
--- a/control/json/actions/timer_based_actions.cpp
+++ b/control/json/actions/timer_based_actions.cpp
@@ -42,9 +42,10 @@
{
// If any of groups' value == nullopt(i.e. not configured), action is
// driven by the service owned state of the group members
- _byOwner = std::any_of(
- _groups.begin(), _groups.end(),
- [](const auto& group) { return group.getValue() == std::nullopt; });
+ _byOwner =
+ std::any_of(_groups.begin(), _groups.end(), [](const auto& group) {
+ return group.getValue() == std::nullopt;
+ });
setTimerConf(jsonObj);
setActions(jsonObj);
@@ -57,12 +58,13 @@
// If any service providing a group member is not owned, start
// timer and if all members' services are owned, stop timer.
if (std::any_of(_groups.begin(), _groups.end(), [](const auto& group) {
- const auto& members = group.getMembers();
- return std::any_of(members.begin(), members.end(),
- [&group](const auto& member) {
- return !Manager::hasOwner(member, group.getInterface());
- });
- }))
+ const auto& members = group.getMembers();
+ return std::any_of(
+ members.begin(), members.end(),
+ [&group](const auto& member) {
+ return !Manager::hasOwner(member, group.getInterface());
+ });
+ }))
{
startTimer();
}
@@ -77,16 +79,18 @@
// If all group members have a given value and it matches what's
// in the cache, start timer and if any do not match, stop
// timer.
- if (std::all_of(_groups.begin(), _groups.end(),
- [&mgr](const auto& group) {
- const auto& members = group.getMembers();
- return std::all_of(members.begin(), members.end(),
- [&mgr, &group](const auto& member) {
- return group.getValue() ==
- mgr->getProperty(member, group.getInterface(),
- group.getProperty());
- });
- }))
+ if (std::all_of(
+ _groups.begin(), _groups.end(), [&mgr](const auto& group) {
+ const auto& members = group.getMembers();
+ return std::all_of(
+ members.begin(), members.end(),
+ [&mgr, &group](const auto& member) {
+ return group.getValue() ==
+ mgr->getProperty(member,
+ group.getInterface(),
+ group.getProperty());
+ });
+ }))
{
// Timer will be started(and never stopped) when _groups is empty
startTimer();
@@ -143,8 +147,8 @@
// Add zone to _actions
std::for_each(_actions.begin(), _actions.end(),
[&zone](std::unique_ptr<ActionBase>& action) {
- action->addZone(zone);
- });
+ action->addZone(zone);
+ });
}
}