prefer std::format over fmt
Switch to std::format to remove the dependency on fmt.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Id3a1295ba8a90fb756cfc500892dcc5b3235e27b
diff --git a/powermode.cpp b/powermode.cpp
index 342188e..88422bf 100644
--- a/powermode.cpp
+++ b/powermode.cpp
@@ -1,9 +1,10 @@
#include "powermode.hpp"
#include <fcntl.h>
-#include <fmt/core.h>
#include <sys/ioctl.h>
+#include <format>
+
#ifdef POWERVM_CHECK
#include <com/ibm/Host/Target/server.hpp>
#endif
@@ -41,7 +42,7 @@
if (masterOccPath != path)
{
log<level::ERR>(
- fmt::format(
+ std::format(
"PowerMode::setMasterOcc: Master changed (was OCC{}, {})",
occInstance, masterOccPath)
.c_str());
@@ -53,7 +54,7 @@
}
path = masterOccPath;
occInstance = path.back() - '0';
- log<level::DEBUG>(fmt::format("PowerMode::setMasterOcc(OCC{}, {})",
+ log<level::DEBUG>(std::format("PowerMode::setMasterOcc(OCC{}, {})",
occInstance, path.c_str())
.c_str());
if (!occCmd)
@@ -101,7 +102,7 @@
persistedData.updateMode(newMode, 0);
log<level::INFO>(
- fmt::format("DBus Power Mode Changed: {}", propVal).c_str());
+ std::format("DBus Power Mode Changed: {}", propVal).c_str());
// Send mode change to OCC
sendModeChange();
@@ -121,7 +122,7 @@
bool PowerMode::powerModeLockStatus()
{
bool status = persistedData.getModeLock(); // read persistent data
- log<level::INFO>(fmt::format("PowerMode::powerModeLockStatus: {}",
+ log<level::INFO>(std::format("PowerMode::powerModeLockStatus: {}",
status ? "locked" : "unlocked")
.c_str());
return status;
@@ -191,7 +192,7 @@
if (mode != Mode::PowerMode::OEM)
{
log<level::ERR>(
- fmt::format(
+ std::format(
"convertStringToMode: Invalid Power Mode specified: {}",
i_modeString)
.c_str());
@@ -229,7 +230,7 @@
}
log<level::DEBUG>(
- fmt::format("isPowerVM returning {}", powerVmTarget).c_str());
+ std::format("isPowerVM returning {}", powerVmTarget).c_str());
#endif
return powerVmTarget;
@@ -248,7 +249,7 @@
return false;
}
log<level::INFO>(
- fmt::format("PowerMode::initPersistentData: Using default mode: {}",
+ std::format("PowerMode::initPersistentData: Using default mode: {}",
currentMode)
.c_str());
@@ -295,7 +296,7 @@
!VALID_OEM_POWER_MODE_SETTING(newMode))
{
log<level::ERR>(
- fmt::format(
+ std::format(
"PowerMode::updateDbusMode - Requested power mode not supported: {}",
newMode)
.c_str());
@@ -373,7 +374,7 @@
cmd.push_back(oemModeData & 0xFF); //
cmd.push_back(0x00); // reserved
log<level::INFO>(
- fmt::format(
+ std::format(
"PowerMode::sendModeChange: SET_MODE({},{}) command to OCC{} ({} bytes)",
newMode, oemModeData, occInstance, cmd.size())
.c_str());
@@ -385,7 +386,7 @@
if (RspStatus::SUCCESS != RspStatus(rsp[2]))
{
log<level::ERR>(
- fmt::format(
+ std::format(
"PowerMode::sendModeChange: SET MODE failed with status 0x{:02X}",
rsp[2])
.c_str());
@@ -404,7 +405,7 @@
else
{
log<level::ERR>(
- fmt::format(
+ std::format(
"PowerMode::sendModeChange: SET_MODE FAILED with status={}",
status)
.c_str());
@@ -413,7 +414,7 @@
else
{
log<level::ERR>(
- fmt::format(
+ std::format(
"PowerMode::sendModeChange: Unable to set power mode to {}",
newMode)
.c_str());
@@ -443,7 +444,7 @@
{
ipsEnabled = std::get<bool>(ipsEntry->second);
log<level::INFO>(
- fmt::format("Idle Power Saver change: Enabled={}", ipsEnabled)
+ std::format("Idle Power Saver change: Enabled={}", ipsEnabled)
.c_str());
parmsChanged = true;
}
@@ -452,7 +453,7 @@
{
enterUtil = std::get<uint8_t>(ipsEntry->second);
log<level::INFO>(
- fmt::format("Idle Power Saver change: Enter Util={}%", enterUtil)
+ std::format("Idle Power Saver change: Enter Util={}%", enterUtil)
.c_str());
parmsChanged = true;
}
@@ -463,7 +464,7 @@
enterTime =
std::chrono::duration_cast<std::chrono::seconds>(ms).count();
log<level::INFO>(
- fmt::format("Idle Power Saver change: Enter Time={}sec", enterTime)
+ std::format("Idle Power Saver change: Enter Time={}sec", enterTime)
.c_str());
parmsChanged = true;
}
@@ -472,7 +473,7 @@
{
exitUtil = std::get<uint8_t>(ipsEntry->second);
log<level::INFO>(
- fmt::format("Idle Power Saver change: Exit Util={}%", exitUtil)
+ std::format("Idle Power Saver change: Exit Util={}%", exitUtil)
.c_str());
parmsChanged = true;
}
@@ -482,7 +483,7 @@
std::chrono::milliseconds ms(std::get<uint64_t>(ipsEntry->second));
exitTime = std::chrono::duration_cast<std::chrono::seconds>(ms).count();
log<level::INFO>(
- fmt::format("Idle Power Saver change: Exit Time={}sec", exitTime)
+ std::format("Idle Power Saver change: Exit Time={}sec", exitTime)
.c_str());
parmsChanged = true;
}
@@ -544,7 +545,7 @@
if (enterUtil > exitUtil)
{
log<level::ERR>(
- fmt::format(
+ std::format(
"ERROR: Idle Power Saver Enter Utilization ({}%) is > Exit Utilization ({}%) - using Exit for both",
enterUtil, exitUtil)
.c_str());
@@ -595,7 +596,7 @@
getIPSParms(ipsEnabled, enterUtil, enterTime, exitUtil, exitTime);
log<level::INFO>(
- fmt::format(
+ std::format(
"Idle Power Saver Parameters: enabled:{}, enter:{}%/{}s, exit:{}%/{}s",
ipsEnabled, enterUtil, enterTime, exitUtil, exitTime)
.c_str());
@@ -614,7 +615,7 @@
cmd.push_back(exitTime >> 8); // Exit Delay Time
cmd.push_back(exitTime & 0xFF); //
cmd.push_back(exitUtil); // Exit Utilization
- log<level::INFO>(fmt::format("PowerMode::sendIpsData: SET_CFG_DATA[IPS] "
+ log<level::INFO>(std::format("PowerMode::sendIpsData: SET_CFG_DATA[IPS] "
"command to OCC{} ({} bytes)",
occInstance, cmd.size())
.c_str());
@@ -626,7 +627,7 @@
if (RspStatus::SUCCESS != RspStatus(rsp[2]))
{
log<level::ERR>(
- fmt::format(
+ std::format(
"PowerMode::sendIpsData: SET_CFG_DATA[IPS] failed with status 0x{:02X}",
rsp[2])
.c_str());
@@ -645,7 +646,7 @@
else
{
log<level::ERR>(
- fmt::format(
+ std::format(
"PowerMode::sendIpsData: SET_CFG_DATA[IPS] with status={}",
status)
.c_str());
@@ -660,7 +661,7 @@
if (modeData.modeInitialized)
{
log<level::INFO>(
- fmt::format(
+ std::format(
"OccPersistData: Mode: 0x{:02X}, OEM Mode Data: {} (0x{:04X} Locked{})",
modeData.mode, modeData.oemModeData, modeData.oemModeData,
modeData.modeLocked)
@@ -669,7 +670,7 @@
if (modeData.ipsInitialized)
{
log<level::INFO>(
- fmt::format(
+ std::format(
"OccPersistData: IPS enabled:{}, enter:{}%/{}s, exit:{}%/{}s",
modeData.ipsEnabled, modeData.ipsEnterUtil,
modeData.ipsEnterTime, modeData.ipsExitUtil,
@@ -690,7 +691,7 @@
}
log<level::DEBUG>(
- fmt::format(
+ std::format(
"OccPersistData::save: Writing Power Mode persisted data to {}",
opath.c_str())
.c_str());
@@ -716,7 +717,7 @@
}
log<level::DEBUG>(
- fmt::format(
+ std::format(
"OccPersistData::load: Reading Power Mode persisted data from {}",
ipath.c_str())
.c_str());
@@ -730,7 +731,7 @@
{
auto error = errno;
log<level::ERR>(
- fmt::format("OccPersistData::load: failed to read {}, errno={}",
+ std::format("OccPersistData::load: failed to read {}, errno={}",
ipath.c_str(), error)
.c_str());
modeData.modeInitialized = false;
@@ -751,7 +752,7 @@
if ((!persistedData.modeAvailable()) || (!persistedData.ipsAvailable()))
{
log<level::INFO>(
- fmt::format(
+ std::format(
"Default PowerModeProperties are now available (persistent modeAvail={}, ipsAvail={})",
persistedData.modeAvailable() ? 'y' : 'n',
persistedData.modeAvailable() ? 'y' : 'n')
@@ -787,7 +788,7 @@
if (!VALID_POWER_MODE_SETTING(defaultMode))
{
log<level::ERR>(
- fmt::format(
+ std::format(
"PowerMode::getDefaultMode: Invalid default power mode found: {}",
defaultMode)
.c_str());
@@ -799,7 +800,7 @@
catch (const sdbusplus::exception_t& e)
{
log<level::ERR>(
- fmt::format("Unable to read Default Power Mode: {}", e.what())
+ std::format("Unable to read Default Power Mode: {}", e.what())
.c_str());
return false;
}
@@ -839,7 +840,7 @@
catch (const sdbusplus::exception_t& e)
{
log<level::ERR>(
- fmt::format(
+ std::format(
"Unable to read Default Idle Power Saver parameters so it will be disabled: {}",
e.what())
.c_str());
@@ -904,7 +905,7 @@
if (enterUtil > exitUtil)
{
log<level::ERR>(
- fmt::format(
+ std::format(
"ERROR: Default Idle Power Saver Enter Utilization ({}%) is > Exit Utilization ({}%) - using Exit for both",
enterUtil, exitUtil)
.c_str());
@@ -929,7 +930,7 @@
return false;
}
log<level::INFO>(
- fmt::format(
+ std::format(
"PowerMode::useDefaultIPSParms: Using default IPS parms: Enabled: {}, EnterUtil: {}%, EnterTime: {}s, ExitUtil: {}%, ExitTime: {}s",
ipsEnabled, enterUtil, enterTime, exitUtil, exitTime)
.c_str());
@@ -952,7 +953,7 @@
const int open_errno = errno;
if (fd < 0)
{
- log<level::ERR>(fmt::format("openIpsFile Error({})={} : File={}",
+ log<level::ERR>(std::format("openIpsFile Error({})={} : File={}",
open_errno, strerror(open_errno),
ipsStatusFile.c_str())
.c_str());
@@ -1020,7 +1021,7 @@
ipsStatusCallBack, this);
if (r < 0)
{
- log<level::ERR>(fmt::format("sd_event_add_io: Error({})={} : File={}",
+ log<level::ERR>(std::format("sd_event_add_io: Error({})={} : File={}",
r, strerror(-r), ipsStatusFile.c_str())
.c_str());
@@ -1081,7 +1082,7 @@
removeIpsWatch();
log<level::ERR>(
- fmt::format("IPS state Read Error({})={} : File={} : len={}",
+ std::format("IPS state Read Error({})={} : File={} : len={}",
readErrno, strerror(readErrno),
ipsStatusFile.c_str(), len)
.c_str());
@@ -1117,7 +1118,7 @@
// If the Retry did not get to "watching = true" we already have an
// error log, just post trace.
- log<level::ERR>(fmt::format("Retry on File seek Error({})={} : File={}",
+ log<level::ERR>(std::format("Retry on File seek Error({})={} : File={}",
open_errno, strerror(open_errno),
ipsStatusFile.c_str())
.c_str());
@@ -1150,7 +1151,7 @@
void PowerMode::updateDbusSafeMode(const bool safeModeReq)
{
log<level::DEBUG>(
- fmt::format("PowerMode:updateDbusSafeMode: Update dbus state ({})",
+ std::format("PowerMode:updateDbusSafeMode: Update dbus state ({})",
safeModeReq)
.c_str());