Modify "Retune" Requests Handling (#150)

---
Signed-off-by: Kartik Nema <kartnema@qti.qualcomm.com>

Author: kartnema

modula/Components/Include/Logger.h

@@ -111,6 +111,7 @@ enum CommonMessageTypes {
     NOTIFY_RESMODE_REJECT,
     NOTIFY_CLASSIFIER_PROC_EVENT,
     NOTIFY_CLASSIFIER_PROC_IGNORE,
+    NOTIFY_MODEL_PREDICTION,
 };
 
 /**

modula/Components/Logger.cpp

@@ -731,6 +731,14 @@ void Logger::typeLog(CommonMessageTypes type, const std::string& funcName, ...)
             Logger::log(LOG_DEBUG, "CONTEXTUAL_CLASSIFIER", funcName, buffer);
             break;
 
+        case CommonMessageTypes::NOTIFY_MODEL_PREDICTION:
+            vsnprintf(buffer, sizeof(buffer),
+                      "Prediction complete. PID: %d, Comm: %s, Class: %s, "\
+                      "Probability: %.4f", args);
+
+            Logger::log(LOG_INFO, "CONTEXTUAL_CLASSIFIER", funcName, buffer);
+            break;
+
         default:
             break;
     }

resource-tuner/core/Include/RequestManager.h

@@ -126,8 +126,6 @@ class RequestManager {
      */
     int8_t disableRequestProcessing(int64_t handle);
 
-    void modifyRequestDuration(int64_t handle, int64_t duration);
-
     void markRequestAsComplete(int64_t handle);
 
     int8_t getRequestProcessingStatus(int64_t handle);

resource-tuner/core/RequestHandler.cpp

@@ -266,6 +266,12 @@ static void processIncomingRequest(Request* request, int8_t isValidated=false) {
        request->getRequestType() == REQ_RESOURCE_RETUNING) {
         // Note: Client Data Manager initialisation is not necessary for Untune / Retune Requests,
         // since the client is expected to be allocated already (as part of the Tune Request)
+        if(!clientDataManager->clientExists(request->getClientPID(), request->getClientTID())) {
+            // Client does not exist, drop the request
+            Request::cleanUpRequest(request);
+            return;
+        }
+
         if(request->getRequestType() == REQ_RESOURCE_UNTUNING) {
             // Update the Processing Status for this handle to false
             // This handles the Edge Case where the Client sends the Untune Request immediately.
@@ -278,16 +284,6 @@ static void processIncomingRequest(Request* request, int8_t isValidated=false) {
                 Request::cleanUpRequest(request);
                 return;
             }
-        } else {
-            // Done for handling Edge Cases,
-            // Refer the comment in the if-block for more explanation
-            requestManager->modifyRequestDuration(request->getHandle(), request->getDuration());
-        }
-
-        if(!clientDataManager->clientExists(request->getClientPID(), request->getClientTID())) {
-            // Client does not exist, drop the request
-            Request::cleanUpRequest(request);
-            return;
         }
     }
 

resource-tuner/core/RequestManager.cpp

@@ -224,12 +224,6 @@ int8_t RequestManager::disableRequestProcessing(int64_t handle) {
     return true;
 }
 
-void RequestManager::modifyRequestDuration(int64_t handle, int64_t duration) {
-    (void)handle;
-    (void)duration;
-    return;
-}
-
 int64_t RequestManager::getActiveReqeustsCount() {
     this->mRequestMapMutex.lock_shared();
     int32_t size = this->mActiveRequests.size();

resource-tuner/core/RequestQueue.cpp

@@ -77,7 +77,14 @@ void RequestQueue::orderedQueueConsumerHook() {
 
             } else if(req->getRequestType() == REQ_RESOURCE_RETUNING) {
                 int64_t newDuration = req->getDuration();
-                cocoTable->updateRequest(matchingTuneReq.first, newDuration);
+
+                if((processingStatus & REQ_COMPLETED) == 0) {
+                    // Request not in Coco Table yet
+                    // Update the Request Duration directly.
+                    matchingTuneReq.first->setDuration(newDuration);
+                } else {
+                    cocoTable->updateRequest(matchingTuneReq.first, newDuration);
+                }
 
                 // Free Up the Retune Request
                 Request::cleanUpRequest(req);

resource-tuner/core/ResourceHooks.cpp

@@ -682,11 +682,6 @@ static void resetRunOnCoresExclusively(void* context) {
     }
 }
 
-static void no_op(void* context) {
-    (void)context;
-    return;
-}
-
 static void setPmQos(void* context) {
     if(context == nullptr) return;
     Resource* resource = static_cast<Resource*>(context);