Skip to content

Commit 29d57f7

Browse files
Patel-KamalkumarPatel-Kamalkumar
authored
pldm: Catch exceptions precisely and printing it (ibm-openbmc#503)
Correcting catch block in PLDM repo to print all exception precisely so pldm trace can be more useful to identify defect easily.
1 parent 9a3d71c commit 29d57f7

36 files changed

+244
-191
lines changed

‎fw-update/update_manager.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,8 @@ int UpdateManager::processPackage(const std::filesystem::path& packageFilePath)
112112
}
113113
catch (const std::exception& e)
114114
{
115-
error("Invalid PLDM package header");
115+
error("Invalid PLDM package header ERROR={ERR_EXCEP}", "ERR_EXCEP",
116+
e.what());
116117
activation = std::make_unique<Activation>(
117118
pldm::utils::DBusHandler::getBus(), objPath,
118119
software::Activation::Activations::Invalid, this);

‎host-bmc/dbus_to_host_effecters.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,8 @@ void HostEffecterParser::processHostEffecterChangeNotification(
190190
}
191191
catch (const std::out_of_range& e)
192192
{
193-
error("new state not found in json");
193+
error("new state not found in json ERROR={ERR_EXCEP}", "ERR_EXCEP",
194+
e.what());
194195
return;
195196
}
196197

‎host-bmc/host_pdr_handler.cpp

+7-9
Original file line numberDiff line numberDiff line change
@@ -566,9 +566,8 @@ void HostPDRHandler::mergeEntityAssociations(
566566
TERMINUS_HANDLE, 0xFFFFFFFF);
567567
if (rc)
568568
{
569-
std::cerr
570-
<< "Failed to add entity association PDR from node: "
571-
<< rc << std::endl;
569+
error("Failed to add entity association PDR from node:{RC}",
570+
"RC", rc);
572571
}
573572
}
574573
else
@@ -581,9 +580,8 @@ void HostPDRHandler::mergeEntityAssociations(
581580
terminus_handle, 0xFFFFFFFF);
582581
if (rc)
583582
{
584-
std::cerr
585-
<< "Failed to add entity association PDR from node: "
586-
<< rc << std::endl;
583+
error("Failed to add entity association PDR from node:{RC}",
584+
"RC", rc);
587585
}
588586
}
589587
}
@@ -726,7 +724,7 @@ void HostPDRHandler::parseStateSensorPDRs()
726724
}
727725
// If there is no mapping for terminusHandle assign the reserved TID
728726
// value of 0xFF to indicate that.
729-
catch (const std::out_of_range& e)
727+
catch (const std::out_of_range&)
730728
{
731729
sensorEntry.terminusID = PLDM_TID_RESERVED;
732730
}
@@ -1240,7 +1238,7 @@ void HostPDRHandler::_setHostSensorState()
12401238
stateSetIds) =
12411239
lookupSensorInfo(sensorEntry);
12421240
}
1243-
catch (const std::out_of_range& e)
1241+
catch (const std::out_of_range&)
12441242
{
12451243
try
12461244
{
@@ -1249,7 +1247,7 @@ void HostPDRHandler::_setHostSensorState()
12491247
stateSetIds) =
12501248
lookupSensorInfo(sensorEntry);
12511249
}
1252-
catch (const std::out_of_range& e)
1250+
catch (const std::out_of_range&)
12531251
{
12541252
error("No mapping for the events");
12551253
continue;

‎host-bmc/utils.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ void addObjectPathEntityAssociations(
122122
objPathMap[entity_path] = entity;
123123
}
124124
}
125-
catch (const std::exception& e)
125+
catch (const std::exception&)
126126
{
127127
objPathMap[entity_path] = entity;
128128
}
@@ -156,7 +156,7 @@ void addObjectPathEntityAssociations(
156156
objPathMap[dbusPath] = entity;
157157
}
158158
}
159-
catch (const std::exception& e)
159+
catch (const std::exception&)
160160
{
161161
objPathMap[dbusPath] = entity;
162162
}

‎libpldmresponder/bios.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,9 @@ Response Handler::getDateTime(const pldm_msg* request, size_t /*payloadLength*/)
128128
catch (const sdbusplus::exception_t& e)
129129
{
130130
error(
131-
"Error getting time, PATH={BMC_TIME_PATH} TIME INTERACE={TIME_INTF}",
132-
"BMC_TIME_PATH", bmcTimePath, "TIME_INTF", timeInterface);
131+
"Error getting time, PATH={BMC_TIME_PATH} TIME INTERACE={TIME_INTF} ERROR={ERR_EXCEP}",
132+
"BMC_TIME_PATH", bmcTimePath, "TIME_INTF", timeInterface,
133+
"ERR_EXCEP", e.what());
133134
return CmdHandler::ccOnlyResponse(request, PLDM_ERROR);
134135
}
135136

‎libpldmresponder/bios_attribute.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ BIOSAttribute::BIOSAttribute(const Json& entry,
2525
{
2626
readOnly = entry.at("readOnly");
2727
}
28-
catch (const std::exception& e)
28+
catch (const std::exception&)
2929
{
3030
// No action required, readOnly is initialised to false
3131
}
@@ -39,7 +39,7 @@ BIOSAttribute::BIOSAttribute(const Json& entry,
3939

4040
dBusMap = {objectPath, interface, propertyName, propertyType};
4141
}
42-
catch (const std::exception& e)
42+
catch (const std::exception&)
4343
{
4444
// No action required, dBusMap whill have no value
4545
}

‎libpldmresponder/bios_config.cpp

+9-6
Original file line numberDiff line numberDiff line change
@@ -573,8 +573,9 @@ void BIOSConfig::buildAndStoreAttrTables(const Table& stringTable)
573573
}
574574
catch (const std::exception& e)
575575
{
576-
error("Construct Table Entry Error, AttributeName = {ATTR_NAME}",
577-
"ATTR_NAME", attr->name);
576+
error(
577+
"Construct Table Entry Error, AttributeName = {ATTR_NAME} ERROR={ERR_EXCEP}",
578+
"ATTR_NAME", attr->name, "ERR_EXCEP", e.what());
578579
}
579580
}
580581

@@ -667,8 +668,9 @@ void BIOSConfig::load(const fs::path& filePath, ParseHandler handler)
667668
}
668669
catch (const std::exception& e)
669670
{
670-
error("Failed to parse JSON config file : {FILE_PATH}", "FILE_PATH",
671-
filePath.c_str());
671+
error(
672+
"Failed to parse JSON config file : {FILE_PATH} ERROR={ERR_EXCEP}",
673+
"FILE_PATH", filePath.c_str(), "ERR_EXCEP", e.what());
672674
}
673675
}
674676
}
@@ -959,8 +961,9 @@ void BIOSConfig::processBiosAttrChangeNotification(
959961
}
960962
catch (const std::invalid_argument& e)
961963
{
962-
error("Could not find handle for BIOS string, ATTRIBUTE={ATTR_NAME}",
963-
"ATTR_NAME", attrName.c_str());
964+
error(
965+
"Could not find handle for BIOS string, ATTRIBUTE={ATTR_NAME} ERROR={ERR_EXCEP}",
966+
"ATTR_NAME", attrName.c_str(), "ERR_EXCEP", e.what());
964967
return;
965968
}
966969

‎libpldmresponder/bios_enum_attribute.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ uint8_t BIOSEnumAttribute::getAttrValueIndex()
144144
auto currentValue = iter->second;
145145
return getValueIndex(currentValue, possibleValues);
146146
}
147-
catch (const std::exception& e)
147+
catch (const std::exception&)
148148
{
149149
return defaultValueIndex;
150150
}
@@ -156,7 +156,7 @@ uint8_t BIOSEnumAttribute::getAttrValueIndex(const PropertyValue& propValue)
156156
{
157157
return getValueIndex(std::get<std::string>(propValue), possibleValues);
158158
}
159-
catch (const std::exception& e)
159+
catch (const std::exception&)
160160
{
161161
return getValueIndex(defaultValue, possibleValues);
162162
}

‎libpldmresponder/bios_integer_attribute.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,9 @@ uint64_t BIOSIntegerAttribute::getAttrValue()
211211
}
212212
catch (const std::exception& e)
213213
{
214-
error("Get Integer Attribute Value Error: AttributeName = {ATTR_NAME}",
215-
"ATTR_NAME", name);
214+
error(
215+
"Get Integer Attribute Value Error: AttributeName = {ATTR_NAME} ERROR={ERR_EXCEP}",
216+
"ATTR_NAME", name, "ERR_EXCEP", e.what());
216217
return integerInfo.defaultValue;
217218
}
218219
}

‎libpldmresponder/bios_string_attribute.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,9 @@ std::string BIOSStringAttribute::getAttrValue()
8989
}
9090
catch (const std::exception& e)
9191
{
92-
error("Get String Attribute Value Error: AttributeName = {ATTR_NAME}",
93-
"ATTR_NAME", name);
92+
error(
93+
"Get String Attribute Value Error: AttributeName = {ATTR_NAME} ERROR={ERR_EXCEP}",
94+
"ATTR_NAME", name, "ERR_EXCEP", e.what());
9495
return stringInfo.defString;
9596
}
9697
}

‎libpldmresponder/bios_table.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ bool BIOSTable::isEmpty() const noexcept
2424
{
2525
empty = fs::is_empty(filePath);
2626
}
27-
catch (const fs::filesystem_error& e)
27+
catch (const fs::filesystem_error&)
2828
{
2929
return true;
3030
}

‎libpldmresponder/event_parser.cpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,9 @@ int StateSensorHandler::eventAction(StateSensorEntry entry,
147147
}
148148
catch (const std::out_of_range& e)
149149
{
150-
error("Invalid event state {EVENT_STATE}", "EVENT_STATE",
151-
static_cast<unsigned>(state));
150+
error("Invalid event state {EVENT_STATE} ERROR={ERR_EXCEP}",
151+
"EVENT_STATE", static_cast<unsigned>(state), "ERR_EXCEP",
152+
e.what());
152153
return PLDM_ERROR_INVALID_DATA;
153154
}
154155

@@ -166,7 +167,7 @@ int StateSensorHandler::eventAction(StateSensorEntry entry,
166167
return PLDM_ERROR;
167168
}
168169
}
169-
catch (const std::out_of_range& e)
170+
catch (const std::out_of_range&)
170171
{
171172
// There is no BMC action for this PLDM event
172173
return PLDM_SUCCESS;

‎libpldmresponder/fru.cpp

+12-9
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ pldm_entity FruImpl::getEntityByObjectPath(const dbus::ObjectValueTree& objects,
4444
entity.entity_instance_num = 1;
4545
break;
4646
}
47-
catch (const std::exception& e)
47+
catch (const std::exception&)
4848
{
4949
continue;
5050
}
@@ -166,7 +166,8 @@ void FruImpl::buildFRUTable()
166166
catch (const std::exception& e)
167167
{
168168
info(
169-
"Look up of inventory objects failed and PLDM FRU table creation failed");
169+
"Look up of inventory objects failed and PLDM FRU table creation failed ERROR={ERR_EXCEP}",
170+
"ERR_EXCEP", e.what());
170171
return;
171172
}
172173

@@ -323,7 +324,7 @@ uint32_t FruImpl::populateRecords(
323324
std::back_inserter(tlvs));
324325
}
325326
}
326-
catch (const std::out_of_range& e)
327+
catch (const std::out_of_range&)
327328
{
328329
continue;
329330
}
@@ -1136,7 +1137,7 @@ std::vector<uint32_t> FruImpl::setStatePDRParams(
11361137
pdr->container_id = e.value("container", 0);
11371138
}
11381139
}
1139-
catch (const std::exception& ex)
1140+
catch (const std::exception&)
11401141
{
11411142
pdr->entity_type = e.value("type", 0);
11421143
pdr->entity_instance = e.value("instance", 0);
@@ -1200,8 +1201,9 @@ std::vector<uint32_t> FruImpl::setStatePDRParams(
12001201
catch (const std::exception& e)
12011202
{
12021203
error(
1203-
"D-Bus object path does not exist, effecter ID: {EFFECTER_ID}",
1204-
"EFFECTER_ID", static_cast<uint16_t>(pdr->effecter_id));
1204+
"D-Bus object path does not exist, effecter ID: {EFFECTER_ID} ERROR={ERR_EXCEP}",
1205+
"EFFECTER_ID", static_cast<uint16_t>(pdr->effecter_id),
1206+
"ERR_EXCEP", e.what());
12051207
}
12061208
dbusMappings.emplace_back(std::move(dbusMapping));
12071209
dbusValMaps.emplace_back(std::move(dbusIdToValMap));
@@ -1306,7 +1308,7 @@ std::vector<uint32_t> FruImpl::setStatePDRParams(
13061308
pdr->container_id = e.value("container", 0);
13071309
}
13081310
}
1309-
catch (const std::exception& ex)
1311+
catch (const std::exception&)
13101312
{
13111313
pdr->entity_type = e.value("type", 0);
13121314
pdr->entity_instance = e.value("instance", 0);
@@ -1379,8 +1381,9 @@ std::vector<uint32_t> FruImpl::setStatePDRParams(
13791381
catch (const std::exception& e)
13801382
{
13811383
error(
1382-
"D-Bus object path does not exist, sensor ID: {SENSOR_ID}",
1383-
"SENSOR_ID", static_cast<uint16_t>(pdr->sensor_id));
1384+
"D-Bus object path does not exist, sensor ID: {SENSOR_ID} ERROR={ERR_EXCEP}",
1385+
"SENSOR_ID", static_cast<uint16_t>(pdr->sensor_id),
1386+
"ERR_EXCEP", e.what());
13841387
}
13851388
dbusMappings.emplace_back(std::move(dbusMapping));
13861389
dbusValMaps.emplace_back(std::move(dbusIdToValMap));

‎libpldmresponder/fru_parser.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ void FruParser::setupDefaultDBusLookup(const fs::path& masterJsonPath)
6767
}
6868
catch (const std::exception& e)
6969
{
70-
error("FRU DBus lookup map format error");
70+
error("FRU DBus lookup map format error ERROR={ERR_EXCEP}",
71+
"ERR_EXCEP", e.what());
7172
throw InternalFailure();
7273
}
7374
}
@@ -169,7 +170,7 @@ void FruParser::setupFruRecordMap(const std::string& dirPath)
169170
recordMap.emplace(dbusIntfName, recordInfos);
170171
}
171172
}
172-
catch (const std::exception& e)
173+
catch (const std::exception&)
173174
{
174175
continue;
175176
}

‎libpldmresponder/pdr_numeric_effecter.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ void generateNumericEffecterPDR(const DBusInterface& dBusIntf, const Json& json,
8383
}
8484
}
8585
}
86-
catch (const std::exception& ex)
86+
catch (const std::exception&)
8787
{
8888
pdr->entity_type = e.value("type", 0);
8989
pdr->entity_instance = e.value("instance", 0);

‎libpldmresponder/pdr_state_effecter.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ void generateStateEffecterPDR(const DBusInterface& dBusIntf, const Json& json,
100100
}
101101
}
102102
}
103-
catch (const std::exception& ex)
103+
catch (const std::exception&)
104104
{
105105
pdr->entity_type = e.value("type", 0);
106106
pdr->entity_instance = e.value("instance", 0);

‎libpldmresponder/pdr_state_sensor.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ void generateStateSensorPDR(const DBusInterface& dBusIntf, const Json& json,
149149
}
150150
}
151151
}
152-
catch (const std::exception& ex)
152+
catch (const std::exception&)
153153
{
154154
pdr->entity_type = e.value("type", 0);
155155
pdr->entity_instance = e.value("instance", 0);

‎libpldmresponder/platform.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,8 @@ Response Handler::platformEventMessage(const pldm_msg* request,
441441
}
442442
catch (const std::out_of_range& e)
443443
{
444+
error("Error in handling plateform event msg ERROR={ERR}", "ERR",
445+
e.what());
444446
return CmdHandler::ccOnlyResponse(request, PLDM_ERROR_INVALID_DATA);
445447
}
446448
}
@@ -517,7 +519,7 @@ int Handler::sensorEvent(const pldm_msg* request, size_t payloadLength,
517519
std::tie(entityInfo, compositeSensorStates, stateSetIds) =
518520
hostPDRHandler->lookupSensorInfo(sensorEntry);
519521
}
520-
catch (const std::out_of_range& e)
522+
catch (const std::out_of_range&)
521523
{
522524
// If there is no mapping for tid, sensorId combination, try
523525
// PLDM_TID_RESERVED, sensorId for terminus that is yet to
@@ -529,7 +531,7 @@ int Handler::sensorEvent(const pldm_msg* request, size_t payloadLength,
529531
hostPDRHandler->lookupSensorInfo(sensorEntry);
530532
}
531533
// If there is no mapping for events return PLDM_SUCCESS
532-
catch (const std::out_of_range& e)
534+
catch (const std::out_of_range&)
533535
{
534536
return PLDM_SUCCESS;
535537
}

‎oem/ibm/libpldmresponder/collect_slot_vpd.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ void SlotHandler::processSlotOperations(const std::string& slotObjectPath,
7878
}
7979
catch (const std::bad_optional_access& e)
8080
{
81+
error("Failed to get the adapter dbus object ERROR={ERR}", "ERR",
82+
e.what());
8183
return;
8284
}
8385

0 commit comments

Comments
 (0)