Filter Params

Author: kartnema

contextual-classifier/ContextualClassifier.cpp

@@ -182,8 +182,6 @@ void ContextualClassifier::ClassifierMain() {
             std::string comm;
             uint32_t sigId = URM_SIG_APP_OPEN;
             uint32_t sigType = DEFAULT_SIGNAL_TYPE;
-            int32_t numArgs = 0;
-            uint32_t* args = nullptr;
             uint32_t ctxDetails = 0U;
 
             if(ev.pid != -1) {
@@ -232,14 +230,15 @@ void ContextualClassifier::ClassifierMain() {
                         .mPid = ev.pid,
                         .mSigId = sigId,
                         .mSigType = sigType,
-                        .mNumArgs = numArgs,
-                        .mArgs = args,
+                        .mNumArgs = 0,
+                        .mArgs = nullptr,
                         .mHandleAcq = -1,
                     };
                     postCb((void*)&postProcessData);
 
                     // Record any Configurations made
                     if(postProcessData.mHandleAcq != - 1) {
+                        LOGI(CLASSIFIER_TAG, "Add handle to track: " + std::to_string(postProcessData.mHandleAcq));
                         this->mCurrRestuneHandles.push_back(postProcessData.mHandleAcq);
                     }
                 }
@@ -491,9 +490,7 @@ void ContextualClassifier::configureAppSignals(pid_t incomingPID,
                 appConfig->mSignalCodes[i],
                 0,
                 incomingPID,
-                incomingTID,
-                0,
-                nullptr
+                incomingTID
             );
 
             if(handle != -1) {

resource-tuner/signals/Include/SignalInternal.h

@@ -36,6 +36,8 @@ int64_t acquireSignal(uint32_t sigId,
                       uint32_t sigType,
                       pid_t incomingPID,
                       pid_t incomingTID,
-                      int32_t numArgs,
-                      uint32_t* args);
+                      int32_t numFilterArgs = 0,
+                      uint32_t* filterArgs = nullptr,
+                      int32_t numArgs = 0,
+                      uint32_t* args = nullptr);
 #endif

resource-tuner/signals/SignalHandler.cpp

@@ -329,14 +329,16 @@ static Request* createTuneRequestFromSignal(uint32_t sigId,
                                             uint32_t sigType,
                                             pid_t incomingPID,
                                             pid_t incomingTID,
+                                            int32_t numFilterArgs,
+                                            uint32_t* filterArgs,
                                             int32_t numArgs,
                                             uint32_t* args) {
     try {
         std::shared_ptr<SignalRegistry> sigRegistry = SignalRegistry::getInstance();
 
         // Check if a Signal with the given ID exists in the Registry
         SignalInfo* signalInfo =
-            sigRegistry->getSignalConfigByIdAndType(sigId,sigType, numArgs, args);
+            sigRegistry->getSignalConfigByIdAndType(sigId, sigType, numFilterArgs, filterArgs);
 
         if(signalInfo == nullptr) return nullptr;
 
@@ -390,6 +392,8 @@ int64_t acquireSignal(uint32_t sigId,
                       uint32_t sigType,
                       pid_t incomingPID,
                       pid_t incomingTID,
+                      int32_t numFilterArgs,
+                      uint32_t* filterArgs,
                       int32_t numArgs,
                       uint32_t* args) {
     LOGI(CLASSIFIER_TAG, "LogBook: sigId=" + std::to_string(sigId));
@@ -405,7 +409,9 @@ int64_t acquireSignal(uint32_t sigId,
 
     int64_t handle = -1;
     Request* request =
-        createTuneRequestFromSignal(sigId, sigType, incomingPID, incomingTID, numArgs, args);
+        createTuneRequestFromSignal(sigId, sigType, incomingPID,
+                                    incomingTID, numFilterArgs,
+                                    filterArgs, numArgs, args);
     if(request != nullptr) {
         if(request->getResourcesCount() > 0) {
             // Record:

tests/Component/ConfigSelectionTests.cpp

@@ -96,3 +96,43 @@ URM_TEST(TestBestConfigSelection3, {
     E_ASSERT((signalInfo->mExtraAttrs[SIGNAL_EXTRA_ATTR_HEIGHT] == 4200));
     E_ASSERT((signalInfo->mExtraAttrs[SIGNAL_EXTRA_ATTR_WIDTH] == 5800));
 })
+
+URM_TEST(TestBestConfigSelection4, {
+    std::shared_ptr<SignalRegistry> sigRegistry = SignalRegistry::getInstance();
+
+    SignalInfo* signalInfo = nullptr;
+    uint32_t* extraAttrs = new uint32_t[SIGNAL_EXTRA_ATTRS_COUNT];
+    extraAttrs[0] = 120;
+    extraAttrs[1] = 2160;
+    extraAttrs[2] = 3840;
+    signalInfo = SignalRegistry::getInstance()->getSignalConfigByIdAndType(
+        CONSTRUCT_SIG_CODE(0x0d, 0x0011), 0, SIGNAL_EXTRA_ATTRS_COUNT, extraAttrs
+    );
+
+    E_ASSERT((signalInfo != nullptr));
+    E_ASSERT((signalInfo->mSignalID == 0x0011));
+    E_ASSERT((signalInfo->mSignalCategory == 0x0d));
+    E_ASSERT((strcmp((const char*)signalInfo->mSignalName.data(), "TEST_SIGNAL_15_A") == 0));
+    E_ASSERT((signalInfo->mTimeout == 8000));
+
+    E_ASSERT((signalInfo->mPermissions != nullptr));
+    E_ASSERT((signalInfo->mDerivatives == nullptr));
+    E_ASSERT((signalInfo->mSignalResources != nullptr));
+
+    E_ASSERT((signalInfo->mPermissions->size() == 2));
+    E_ASSERT((signalInfo->mSignalResources->size() == 1));
+
+    E_ASSERT((signalInfo->mPermissions->at(0) == PERMISSION_THIRD_PARTY));
+    E_ASSERT((signalInfo->mPermissions->at(1) == PERMISSION_SYSTEM));
+
+    Resource* resource1 = signalInfo->mSignalResources->at(0);
+    E_ASSERT((resource1->getResCode() == 0x00ff0000));
+    E_ASSERT((resource1->getValuesCount() == 1));
+    E_ASSERT((resource1->getValueAt(0) == 556));
+    E_ASSERT((resource1->getResInfo() == 0x00000000));
+
+    E_ASSERT((signalInfo->mHasExtraAttrs == true));
+    E_ASSERT((signalInfo->mExtraAttrs[SIGNAL_EXTRA_ATTR_FPS] == 120));
+    E_ASSERT((signalInfo->mExtraAttrs[SIGNAL_EXTRA_ATTR_HEIGHT] == 2160));
+    E_ASSERT((signalInfo->mExtraAttrs[SIGNAL_EXTRA_ATTR_WIDTH] == 3840));
+})

tests/Configs/SignalsConfig.yaml

@@ -259,3 +259,29 @@ SignalConfigs:
       - Width: 5800
     Resources:
       - {ResCode: "0x00ff0009", ResInfo: "0x00000002", Values: [445]}
+
+  - SigId: "0x0011"
+    Category: "0x0d"
+    Name: TEST_SIGNAL_15_A
+    Enable: true
+    Permissions: ["third_party", "system"]
+    Timeout: 8000
+    ExtraAttrs:
+      - Fps: 120
+      - Height: 2160
+      - Width: 3840
+    Resources:
+      - {ResCode: "0x00ff0000", ResInfo: "0x00000000", Values: [556]}
+
+  - SigId: "0x0011"
+    Category: "0x0d"
+    Name: TEST_SIGNAL_15_B
+    Enable: true
+    Permissions: ["third_party", "system"]
+    Timeout: 8000
+    ExtraAttrs:
+      - Fps: 30
+      - Height: 4320
+      - Width: 7680
+    Resources:
+      - {ResCode: "0x00ff0003", ResInfo: "0x00000000", Values: [971]}