Extra Attrs

Author: kartnema

contextual-classifier/ContextualClassifier.cpp

@@ -19,6 +19,7 @@
 #include "Extensions.h"
 #include "AuxRoutines.h"
 #include "UrmPlatformAL.h"
+#include "SignalInternal.h"
 #include "SignalRegistry.h"
 #include "RestuneInternal.h"
 #include "ContextualClassifier.h"
@@ -97,67 +98,6 @@ static ResIterable* createMovePidResource(int32_t cGroupdId, pid_t pid) {
     return resIterable;
 }
 
-static Request* createTuneRequestFromSignal(uint32_t sigId,
-                                            uint32_t sigType,
-                                            pid_t incomingPID,
-                                            pid_t incomingTID,
-                                            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->getSignalConfigById(sigId, sigType, args);
-
-        if(signalInfo == nullptr) return nullptr;
-
-        Request* request = MPLACED(Request);
-
-        int64_t handleGenerated = AuxRoutines::generateUniqueHandle();
-        request->setHandle(handleGenerated);
-
-        request->setRequestType(REQ_RESOURCE_TUNING);
-        request->setDuration(signalInfo->mTimeout);
-        request->setProperties(SYSTEM_HIGH);
-        request->setClientPID(incomingPID);
-        request->setClientTID(incomingTID);
-
-        std::vector<Resource*>* signalLocks = signalInfo->mSignalResources;
-
-        for(int32_t i = 0; i < (int32_t)signalLocks->size(); i++) {
-            if((*signalLocks)[i] == nullptr) {
-                continue;
-            }
-
-            // Copy
-            Resource* resource = MPLACEV(Resource, (*((*signalLocks)[i])));
-
-            // fill placeholders if any
-            int32_t listIndex = 0;
-            for(int32_t j = 0; j < resource->getValuesCount(); j++) {
-                if(resource->getValueAt(j) == -1) {
-                    if(args == nullptr) return nullptr;
-                    if(listIndex >= 0 && listIndex < numArgs) {
-                        resource->setValueAt(j, args[listIndex]);
-                        listIndex++;
-                    }
-                }
-            }
-
-            ResIterable* resIterable = MPLACED(ResIterable);
-            resIterable->mData = resource;
-            request->addResource(resIterable);
-        }
-
-        return request;
-
-    } catch(const std::bad_alloc& e) {
-        return nullptr;
-    }
-
-    return nullptr;
-}
-
 ContextualClassifier::~ContextualClassifier() {
     this->Terminate();
     if(this->mInference) {
@@ -294,17 +234,15 @@ void ContextualClassifier::ClassifierMain() {
                         .mSigType = sigType,
                         .mNumArgs = numArgs,
                         .mArgs = args,
+                        .mHandleAcq = -1,
                     };
                     postCb((void*)&postProcessData);
 
-                    sigId = postProcessData.mSigId;
-                    sigType = postProcessData.mSigType;
-                    numArgs = postProcessData.mNumArgs;
-                    args = postProcessData.mArgs;
+                    // Record any Configurations made
+                    if(postProcessData.mHandleAcq != - 1) {
+                        this->mCurrRestuneHandles.push_back(postProcessData.mHandleAcq);
+                    }
                 }
-
-                // Apply actions, call tuneSignal
-                this->ApplyActions(sigId, sigType, ev.pid, ev.tgid, numArgs, args);
             }
         } else if(ev.type == CC_APP_CLOSE) {
             // No Action Needed, Pulse Monitor to take care of cleanup
@@ -405,46 +343,6 @@ int32_t ContextualClassifier::ClassifyProcess(pid_t processPid,
     return context;
 }
 
-void ContextualClassifier::ApplyActions(uint32_t sigId,
-                                        uint32_t sigType,
-                                        pid_t incomingPID,
-                                        pid_t incomingTID,
-                                        int32_t numArgs,
-                                        uint32_t* args) {
-    LOGI(CLASSIFIER_TAG, "LogBook: sigId=" + std::to_string(sigId));
-    LOGI(CLASSIFIER_TAG, "LogBook: sigType=" + std::to_string(sigType));
-    LOGI(CLASSIFIER_TAG, "LogBook: numArgs=" + std::to_string(numArgs));
-
-    if(numArgs > 0) {
-        LOGI(CLASSIFIER_TAG, "front: Printing Stats");
-        LOGI(CLASSIFIER_TAG, "front: fps=" + std::to_string(args[SIGNAL_EXTRA_ATTR_FPS]));
-        LOGI(CLASSIFIER_TAG, "front: height=" + std::to_string(args[SIGNAL_EXTRA_ATTR_HEIGHT]));
-        LOGI(CLASSIFIER_TAG, "front: width=" + std::to_string(args[SIGNAL_EXTRA_ATTR_WIDTH]));
-    }
-
-    Request* request =
-        createTuneRequestFromSignal(sigId, sigType, incomingPID, incomingTID, numArgs, args);
-    if(request != nullptr) {
-        if(request->getResourcesCount() > 0) {
-            // Record:
-            this->mCurrRestuneHandles.push_back(request->getHandle());
-
-            // fast path to Request Queue
-            submitResProvisionRequest(request, false);
-
-        } else {
-            Request::cleanUpRequest(request);
-        }
-    }
-}
-
-void ContextualClassifier::RemoveActions(pid_t processPid, pid_t processTgid) {
-	(void)processPid;
-    (void)processTgid;
-
-    return;
-}
-
 uint32_t ContextualClassifier::GetSignalIDForWorkload(int32_t contextType) {
     switch(contextType) {
         case CC_MULTIMEDIA:
@@ -584,36 +482,24 @@ void ContextualClassifier::MoveAppThreadsToCGroup(pid_t incomingPID,
 void ContextualClassifier::configureAppSignals(pid_t incomingPID,
                                                pid_t incomingTID,
                                                const std::string& comm) {
-    try {
-        // Configure any associated signal
-        AppConfig* appConfig = AppConfigs::getInstance()->getAppConfig(comm);
-        if(appConfig != nullptr && appConfig->mSignalCodes != nullptr) {
-            int32_t numSignals = appConfig->mNumSignals;
-            // Go over the list of proc names (comm) and get their pids
-            for(int32_t i = 0; i < numSignals; i++) {
-                Request* request = createTuneRequestFromSignal(
-                    appConfig->mSignalCodes[i],
-                    0,
-                    incomingPID,
-                    incomingTID,
-                    0,
-                    nullptr);
-
-                if(request != nullptr) {
-                    if(request->getResourcesCount() > 0) {
-                        // fast path to Request Queue
-                        this->mCurrRestuneHandles.push_back(request->getHandle());
-                        submitResProvisionRequest(request, false);
-
-                    } else {
-                        Request::cleanUpRequest(request);
-                    }
-                }
+    // Configure any associated signal
+    AppConfig* appConfig = AppConfigs::getInstance()->getAppConfig(comm);
+    if(appConfig != nullptr && appConfig->mSignalCodes != nullptr) {
+        // Go over the list of proc names (comm) and get their pids
+        for(int32_t i = 0; i < appConfig->mNumSignals; i++) {
+            int64_t handle = acquireSignal(
+                appConfig->mSignalCodes[i],
+                0,
+                incomingPID,
+                incomingTID,
+                0,
+                nullptr
+            );
+
+            if(handle != -1) {
+                this->mCurrRestuneHandles.push_back(handle);
             }
         }
-    } catch(const std::exception& e) {
-        LOGE(CLASSIFIER_TAG,
-             "Failed to acquire per-app config signal, Error: " + std::string(e.what()));
     }
 }
 

extensions/Include/Extensions.h

@@ -25,6 +25,7 @@ typedef struct {
     uint32_t mSigType;
     int32_t mNumArgs;
     uint32_t* mArgs;
+    int64_t mHandleAcq;
 } PostProcessCBData;
 
 /**

resource-tuner/CMakeLists.txt

@@ -64,7 +64,7 @@ install(TARGETS RestuneCore LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 set(HEADER_FILES "")
 list(APPEND HEADER_FILES
   ${CMAKE_CURRENT_SOURCE_DIR}/core/Include/ResourceRegistry.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/signals/Include/SignalRegistry.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/signals/Include/SignalInternal.h
   ${CMAKE_CURRENT_SOURCE_DIR}/core/Include/TargetRegistry.h
 )
 

resource-tuner/init/RestuneInit.cpp

@@ -96,7 +96,6 @@ static void preAllocateMemory() {
     MakeAlloc<std::unordered_set<int64_t>> (maxBlockCount);
     MakeAlloc<MsgForwardInfo> (maxBlockCount);
     MakeAlloc<ResIterable> (maxBlockCount);
-    MakeAlloc<SigIterable> (maxBlockCount);
     MakeAlloc<char[REQ_BUFFER_SIZE]> (maxBlockCount);
     MakeAlloc<Signal> (concurrentRequestsUB);
     MakeAlloc<std::vector<Resource*>> (concurrentRequestsUB * resourcesPerRequestUB);

resource-tuner/init/RestuneParser.cpp

@@ -826,10 +826,9 @@ ErrCode RestuneParser::parseSignalConfigYamlNode(const std::string& filePath) {
                 ADD_TO_SIGNAL_BUILDER(SIGNAL_CONFIGS_ELEM_TIMEOUT, setTimeout);
                 ADD_TO_SIGNAL_BUILDER(SIGNAL_CONFIGS_ELEM_ENABLE, setIsEnabled);
                 ADD_TO_SIGNAL_BUILDER(SIGNAL_CONFIGS_ELEM_FPS, setFps);
-                ADD_TO_SIGNAL_BUILDER(SIGNAL_CONFIGS_ELEM_HEIGHT, setHeight);
+                ADD_TO_SIGNAL_BUILDER(SIGNAL_CONFIGS_ELEM_HEIGHT,setHeight);
                 ADD_TO_SIGNAL_BUILDER(SIGNAL_CONFIGS_ELEM_WIDTH, setWidth);
 
-
                 ADD_RES_TO_SIGNAL_BUILDER(SIGNAL_CONFIGS_ELEM_RESOURCE_CODE, setResCode);
                 ADD_RES_TO_SIGNAL_BUILDER(SIGNAL_CONFIGS_ELEM_RESOURCE_RESINFO, setResInfo);
 

resource-tuner/signals/Include/SignalInternal.h

@@ -9,18 +9,23 @@
 #define SIGNAL_INTERNAL_H
 
 #include "ErrCodes.h"
-#include "Signal.h"
-#include "ExtFeaturesRegistry.h"
-#include "ClientDataManager.h"
-#include "RateLimiter.h"
-#include "ResourceRegistry.h"
-#include "RestuneInternal.h"
 
 /**
  * @brief Internal API for submitting Signal Requests for Processing
- * @details Resource Tuner Modules can directly use this API to submit Requests rather than
+ * @details URM Modules and Extensions can directly use this API to submit Requests rather than
  *          using the Client Interface.
  */
 ErrCode submitSignalRequest(void* clientReq);
 
+/**
+ * @brief Internal API for Acquiring a Signal
+ * @details URM Modules and Extensions can directly use this API to submit Requests rather than
+ *          using the Client Interface.
+ */
+int64_t acquireSignal(uint32_t sigId,
+                      uint32_t sigType,
+                      pid_t incomingPID,
+                      pid_t incomingTID,
+                      int32_t numArgs,
+                      uint32_t* args);
 #endif

resource-tuner/signals/Include/SignalRegistry.h

@@ -12,8 +12,6 @@
 #include "Utils.h"
 #include "Logger.h"
 #include "Resource.h"
-#include "DLManager.h"
-#include "MemoryPool.h"
 #include "UrmSettings.h"
 #include "UrmPlatformAL.h"
 
@@ -24,7 +22,7 @@ enum SignalExtraAttrIndex {
     SIGNAL_EXTRA_ATTR_FPS    = 0, //!< Frames per second
     SIGNAL_EXTRA_ATTR_HEIGHT = 1, //!< Frame height in pixels
     SIGNAL_EXTRA_ATTR_WIDTH  = 2, //!< Frame width in pixels
-    SIGNAL_EXTRA_ATTRS_COUNT = 3  //!< Total number of extra attributes (must remain last)
+    SIGNAL_EXTRA_ATTRS_COUNT = 3  //!< Total number of extra attributes
 };
 
 /**
@@ -33,7 +31,7 @@ enum SignalExtraAttrIndex {
  * @details This information is read from the Config files.\n
  *          Note this (SignalInfo) struct is separate from the Signal struct.
  */
-typedef struct {
+typedef struct _signalInfo {
     /**
      * @brief Category of the Signal
      */
@@ -70,17 +68,11 @@ typedef struct {
     /**
      * @brief Array of optional extra attributes associated with the Signal.
      *        Each index corresponds to a named attribute (see SIGNAL_EXTRA_ATTR_* constants).
-     *        A value of 0 at any index indicates that attribute is not set.
-     *        Index layout:
-     *          [SIGNAL_EXTRA_ATTR_FPS]    = frames per second
-     *          [SIGNAL_EXTRA_ATTR_HEIGHT] = frame height in pixels
-     *          [SIGNAL_EXTRA_ATTR_WIDTH]  = frame width in pixels
      */
     uint32_t mExtraAttrs[SIGNAL_EXTRA_ATTRS_COUNT];
 
     /**
-     * @brief Indicates whether any ExtraAttrs were present in the Signal config.
-     *        Set to true if an ExtraAttrs block was parsed; false otherwise.
+     * @brief Indicates whether any ExtraAttrs are present
      */
     int8_t mHasExtraAttrs;
 
@@ -89,8 +81,16 @@ typedef struct {
      *        Values to be configured for the Resources.
      */
     std::vector<Resource*>* mSignalResources;
+
+    _signalInfo* next;
 } SignalInfo;
 
+struct SignalConf {
+    SignalInfo* mSignalInfo;
+    SignalInfo* mFeatureSignals;
+    SignalConf() : mSignalInfo(nullptr), mFeatureSignals(nullptr) {}
+};
+
 /**
  * @brief SignalRegistry
  * @details Stores information Relating to all the Signals available for Tuning.
@@ -101,11 +101,17 @@ class SignalRegistry {
     static std::shared_ptr<SignalRegistry> signalRegistryInstance;
 
     int32_t mTotalSignals;
-    std::unordered_map<uint64_t, std::vector<SignalInfo*>> mSignalsConfigs;
+    std::unordered_map<uint64_t, SignalConf> mSignalsConfigs;
 
     SignalRegistry();
 
-    SignalInfo* findBestExtraAttrsMatch(std::vector<SignalInfo*>& dlm, const uint32_t* extraAttrs) const;
+    SignalInfo* findBestExtraAttrsMatch(SignalInfo* featureSignalHead,
+                                        int32_t numArgs,
+                                        const uint32_t* extraAttrs);
+    int8_t isDuplicateConfig(SignalInfo* src, SignalInfo* dest);
+    void addToFeaturedSigList(SignalInfo** mFeatureSignals,
+                              SignalInfo* newSignal,
+                              int8_t& isOverriden);
 
 public:
     ~SignalRegistry();
@@ -129,7 +135,9 @@ class SignalRegistry {
     *                   A non-null pointer selects the extra-attrs storage path.
     * @return SignalInfo* or nullptr if not found.
     */
-    SignalInfo* getSignalConfigById(uint64_t sigID, const uint32_t* extraAttrs = nullptr);
+    SignalInfo* getSignalConfigById(uint64_t sigID,
+                                    int32_t numArgs = 0,
+                                    const uint32_t* extraAttrs = nullptr);
 
    /**
     * @brief Get the SignalInfo object corresponding to the given Signal ID and type.
@@ -141,7 +149,10 @@ class SignalRegistry {
     *                   A non-null pointer selects the extra-attrs storage path.
     * @return SignalInfo* or nullptr if not found.
     */
-    SignalInfo* getSignalConfigById(uint32_t sigCode, uint32_t sigType, const uint32_t* extraAttrs = nullptr);
+    SignalInfo* getSignalConfigByIdAndType(uint32_t sigCode,
+                                           uint32_t sigType,
+                                           int32_t numArgs = 0,
+                                           const uint32_t* extraAttrs = nullptr);
 
     int32_t getSignalsConfigCount();
 
@@ -151,7 +162,8 @@ class SignalRegistry {
                 signalRegistryInstance = std::shared_ptr<SignalRegistry>(new SignalRegistry());
             } catch(const std::bad_alloc& e) {
                 LOGE("RESTUNE_SIGNAL_REGISTRY",
-                     "Failed to allocate memory for SignalRegistry instance: " + std::string(e.what()));
+                     "Failed to allocate memory for SignalRegistry: "
+                     + std::string(e.what()));
                 return nullptr;
             }
         }
@@ -203,6 +215,4 @@ class ResourceBuilder {
     Resource* build();
 };
 
-typedef Iterable<SignalInfo*> SigIterable;
-
 #endif