Skip to content

Commit 8c045ac

Browse files
committed
Change placeholder value to int_min
Signed-off-by: Kartik Nema <kartnema@qti.qualcomm.com>
1 parent e136c60 commit 8c045ac

5 files changed

Lines changed: 14 additions & 12 deletions

File tree

modula/Components/Logger.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ void Logger::typeLog(CommonMessageTypes type, const std::string& funcName, ...)
428428

429429
case CommonMessageTypes::VERIFIER_INVALID_OPCODE:
430430
vsnprintf(buffer, sizeof(buffer),
431-
"Invalid Opcode [%u], Dropping Request.", args);
431+
"Invalid Opcode [0x%08x], Dropping Request.", args);
432432

433433
Logger::log(LOG_ERR, "URM_REQUEST_VERIFIER", funcName, buffer);
434434
break;

resource-tuner/signals/Include/SignalRegistry.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
#include "UrmPlatformAL.h"
1717
#include "SignalInternal.h"
1818

19+
#define NSIG_PLACEHOLDER std::numeric_limits<int>::min()
20+
1921
/**
2022
* @struct SignalInfo
2123
* @brief Representation of a single Signal Configuration

resource-tuner/signals/SignalHandler.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ static Request* createResourceTuningRequest(Signal* signal) {
139139

140140
// fill placeholders if any
141141
for(int32_t j = 0; j < resource->getValuesCount(); j++) {
142-
if(resource->getValueAt(j) == -1) {
142+
if(resource->getValueAt(j) == NSIG_PLACEHOLDER) {
143143
if(signal->getListArgs() == nullptr) return nullptr;
144144
if(listIndex >= 0 && listIndex < signal->getNumArgs()) {
145145
resource->setValueAt(j, signal->getListArgAt(listIndex));
@@ -364,7 +364,7 @@ static Request* createTuneRequestFromSignal(uint32_t sigId,
364364
// fill placeholders if any
365365
int32_t listIndex = 0;
366366
for(int32_t j = 0; j < resource->getValuesCount(); j++) {
367-
if(resource->getValueAt(j) == -1) {
367+
if(resource->getValueAt(j) == NSIG_PLACEHOLDER) {
368368
if(args == nullptr) return nullptr;
369369
if(listIndex >= 0 && listIndex < numArgs) {
370370
resource->setValueAt(j, args[listIndex]);

resource-tuner/signals/SignalRegistry.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ ErrCode ResourceBuilder::addValue(int32_t index, const std::string& valueString)
520520
return RC_MEMORY_ALLOCATION_FAILURE;
521521
}
522522

523-
int32_t value = -1;
523+
int32_t value = NSIG_PLACEHOLDER;
524524

525525
// Check if the value is a placeholder, i.e. the actual value will be populated
526526
// dynamically at runtime via the "list" argument passed to tuneSignal API.

tests/Component/ParserTests.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -180,16 +180,16 @@ URM_TEST(SignalParsingTests, {
180180
Resource* resource1 = signalInfo->mSignalResources->at(0);
181181
E_ASSERT((resource1->getResCode() == 0x000900aa));
182182
E_ASSERT((resource1->getValuesCount() == 3));
183-
E_ASSERT((resource1->getValueAt(0) == -1));
184-
E_ASSERT((resource1->getValueAt(1) == -1));
183+
E_ASSERT((resource1->getValueAt(0) == NSIG_PLACEHOLDER));
184+
E_ASSERT((resource1->getValueAt(1) == NSIG_PLACEHOLDER));
185185
E_ASSERT((resource1->getValueAt(2) == 68));
186186
E_ASSERT((resource1->getResInfo() == 0));
187187

188188
Resource* resource2 = signalInfo->mSignalResources->at(1);
189189
E_ASSERT((resource2->getResCode() == 0x000900dc));
190190
E_ASSERT((resource2->getValuesCount() == 4));
191-
E_ASSERT((resource2->getValueAt(0) == -1));
192-
E_ASSERT((resource2->getValueAt(1) == -1));
191+
E_ASSERT((resource2->getValueAt(0) == NSIG_PLACEHOLDER));
192+
E_ASSERT((resource2->getValueAt(1) == NSIG_PLACEHOLDER));
193193
E_ASSERT((resource2->getValueAt(2) == 50));
194194
E_ASSERT((resource2->getValueAt(3) == 512));
195195
E_ASSERT((resource2->getResInfo() == 0));
@@ -781,16 +781,16 @@ URM_TEST(SignalParsingTestsAddOn, {
781781
Resource* resource1 = signalInfo->mSignalResources->at(0);
782782
E_ASSERT((resource1->getResCode() == 0x000900aa));
783783
E_ASSERT((resource1->getValuesCount() == 3));
784-
E_ASSERT((resource1->getValueAt(0) == -1));
785-
E_ASSERT((resource1->getValueAt(1) == -1));
784+
E_ASSERT((resource1->getValueAt(0) == NSIG_PLACEHOLDER));
785+
E_ASSERT((resource1->getValueAt(1) == NSIG_PLACEHOLDER));
786786
E_ASSERT((resource1->getValueAt(2) == 68));
787787
E_ASSERT((resource1->getResInfo() == 0));
788788

789789
Resource* resource2 = signalInfo->mSignalResources->at(1);
790790
E_ASSERT((resource2->getResCode() == 0x000900dc));
791791
E_ASSERT((resource2->getValuesCount() == 4));
792-
E_ASSERT((resource2->getValueAt(0) == -1));
793-
E_ASSERT((resource2->getValueAt(1) == -1));
792+
E_ASSERT((resource2->getValueAt(0) == NSIG_PLACEHOLDER));
793+
E_ASSERT((resource2->getValueAt(1) == NSIG_PLACEHOLDER));
794794
E_ASSERT((resource2->getValueAt(2) == 50));
795795
E_ASSERT((resource2->getValueAt(3) == 512));
796796
E_ASSERT((resource2->getResInfo() == 0));

0 commit comments

Comments
 (0)